diff --git a/iscsi-scst/include/iscsi_scst_ver.h b/iscsi-scst/include/iscsi_scst_ver.h index 692ece900..04c7b7dc7 100644 --- a/iscsi-scst/include/iscsi_scst_ver.h +++ b/iscsi-scst/include/iscsi_scst_ver.h @@ -22,4 +22,4 @@ #define ISCSI_VERSION_STRING_SUFFIX #endif -#define ISCSI_VERSION_STRING "2.2.1-pre" ISCSI_VERSION_STRING_SUFFIX +#define ISCSI_VERSION_STRING "2.2.1" ISCSI_VERSION_STRING_SUFFIX diff --git a/qla2x00t/qla2x00-target/qla2x00t.h b/qla2x00t/qla2x00-target/qla2x00t.h index a6a942f78..ed6aac341 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.h +++ b/qla2x00t/qla2x00-target/qla2x00t.h @@ -31,8 +31,8 @@ /* Version numbers, the same as for the kernel */ #define Q2T_VERSION(a, b, c, d) (((a) << 030) + ((b) << 020) + (c) << 010 + (d)) -#define Q2T_VERSION_CODE Q2T_VERSION(2, 2, 0, 0) -#define Q2T_VERSION_STRING "2.2.1-pre" +#define Q2T_VERSION_CODE Q2T_VERSION(2, 2, 1, 0) +#define Q2T_VERSION_STRING "2.2.1" #define Q2T_PROC_VERSION_NAME "version" #define Q2T_MAX_CDB_LEN 16 diff --git a/scst/include/scst.h b/scst/include/scst.h index 38b26bf61..6c0deb30c 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -1071,7 +1071,7 @@ struct scst_tgt_template { /* * Optional revision to be reported in the SCSI inquiry response. If * NULL, an SCST device handler specific default value will be used, - * e.g. " 220" for scst_vdisk file I/O. + * e.g. " 221" for scst_vdisk file I/O. */ const char *revision; diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h index 7a2702acf..91e589857 100644 --- a/scst/include/scst_const.h +++ b/scst/include/scst_const.h @@ -38,13 +38,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(2, 2, 0, 0) +#define SCST_VERSION_CODE SCST_VERSION(2, 2, 1, 0) #ifdef CONFIG_SCST_PROC #define SCST_VERSION_STRING_SUFFIX "-procfs" #else #define SCST_VERSION_STRING_SUFFIX #endif -#define SCST_VERSION_NAME "2.2.1-pre" +#define SCST_VERSION_NAME "2.2.1" #define SCST_VERSION_STRING SCST_VERSION_NAME SCST_VERSION_STRING_SUFFIX #define SCST_CONST_VERSION "$Revision$" diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index d7e257eec..1677ca099 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -75,7 +75,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 " 220" +#define SCST_FIO_REV " 221" #define MAX_USN_LEN (20+1) /* For '\0' */ diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c index aa1a4df72..3d9160606 100644 --- a/scst_local/scst_local.c +++ b/scst_local/scst_local.c @@ -84,8 +84,8 @@ static unsigned long scst_local_trace_flag = SCST_LOCAL_DEFAULT_LOG_FLAGS; #define scsi_bufflen(cmd) ((cmd)->request_bufflen) #endif -#define SCST_LOCAL_VERSION "2.2.1-pre" -static const char *scst_local_version_date = "20120126"; +#define SCST_LOCAL_VERSION "2.2.1" +static const char *scst_local_version_date = "2013-01-12"; /* Some statistics */ static atomic_t num_aborts = ATOMIC_INIT(0); diff --git a/scstadmin/scstadmin.sysfs/scstadmin b/scstadmin/scstadmin.sysfs/scstadmin index 0e7b56fd9..43ee1c160 100755 --- a/scstadmin/scstadmin.sysfs/scstadmin +++ b/scstadmin/scstadmin.sysfs/scstadmin @@ -1,6 +1,6 @@ #!/usr/bin/perl -$Version = 'SCST Configurator v2.2.0'; +$Version = 'SCST Configurator v2.2.1'; # Configures SCST # diff --git a/srpt/ChangeLog b/srpt/ChangeLog index 62029ebec..07fb4977d 100644 --- a/srpt/ChangeLog +++ b/srpt/ChangeLog @@ -1,5 +1,5 @@ -Next release ------------- +Version 2.2.1 (January 12, 2013) +------------- Changes compared to version 2.2.0: - Made sure that the SCST session is unregistered after an initiator logs out. diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index babb0213a..f9a99d9aa 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -58,8 +58,8 @@ /* Name of this kernel module. */ #define DRV_NAME "ib_srpt" -#define DRV_VERSION "2.2.2-pre" -#define DRV_RELDATE "(not yet released)" +#define DRV_VERSION "2.2.1" +#define DRV_RELDATE "2013-01-12" #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) /* Flags to be used in SCST debug tracing statements. */ #define DEFAULT_SRPT_TRACE_FLAGS (TRACE_OUT_OF_MEM | TRACE_MINOR \ diff --git a/usr/fileio/common.h b/usr/fileio/common.h index 8e0fbd8d5..11e437f57 100644 --- a/usr/fileio/common.h +++ b/usr/fileio/common.h @@ -25,7 +25,7 @@ /* 8 byte ASCII Vendor */ #define VENDOR "SCST_USR" /* 4 byte ASCII Product Revision Level - left aligned */ -#define FIO_REV " 220" +#define FIO_REV " 221" #define MAX_USN_LEN (20+1) /* For '\0' */ diff --git a/usr/fileio/fileio.c b/usr/fileio/fileio.c index bc0f3d344..2cabbd942 100644 --- a/usr/fileio/fileio.c +++ b/usr/fileio/fileio.c @@ -67,7 +67,7 @@ unsigned long trace_flag = DEFAULT_LOG_FLAGS; #endif /* defined(DEBUG) || defined(TRACING) */ #define DEF_BLOCK_SHIFT 9 -#define VERSION_STR "2.2.1-pre" +#define VERSION_STR "2.2.1" #define THREADS 7 #define MAX_VDEVS 10