Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2017-09-01 07:19:45 -07:00
14 changed files with 15 additions and 14 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
Generic SCSI target mid-level for Linux (SCST)
==============================================
Version 3.3.0, XX XXXXX 2014
Version 3.4.0, XX XXXXX 2017
----------------------------
SCST is designed to provide unified, consistent interface between SCSI
+2 -2
View File
@@ -44,13 +44,13 @@
* and FIO_REV in usr/fileio/common.h as well.
*/
#define SCST_VERSION(a, b, c, d) (((a) << 24) + ((b) << 16) + ((c) << 8) + d)
#define SCST_VERSION_CODE SCST_VERSION(3, 1, 0, 0)
#define SCST_VERSION_CODE SCST_VERSION(3, 4, 0, 0)
#ifdef CONFIG_SCST_PROC
#define SCST_VERSION_STRING_SUFFIX "-procfs"
#else
#define SCST_VERSION_STRING_SUFFIX
#endif
#define SCST_VERSION_NAME "3.3.0-pre1"
#define SCST_VERSION_NAME "3.4.0-pre1"
#define SCST_VERSION_STRING SCST_VERSION_NAME SCST_VERSION_STRING_SUFFIX
#define SCST_CONST_VERSION SCST_CONST_INTF_VER
+1 -1
View File
@@ -86,7 +86,7 @@ static struct scst_trace_log vdisk_local_trace_tbl[] = {
#define SCST_FIO_VENDOR "SCST_FIO"
#define SCST_BIO_VENDOR "SCST_BIO"
/* 4 byte ASCII Product Revision Level - left aligned */
#define SCST_FIO_REV "330 "
#define SCST_FIO_REV "340 "
#define MAX_USN_LEN (20+1) /* For '\0' */
#define MAX_INQ_VEND_SPECIFIC_LEN (INQ_BUF_SZ - 96)