From a5f67cd1f214fda19f34e641bdfa79462d6a1024 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 2 Aug 2016 16:31:00 +0000 Subject: [PATCH 1/5] scst_dlm: Instantiate lockspace as soon as cluster mode is enabled git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6920 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/scst_dlm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/scst/src/scst_dlm.c b/scst/src/scst_dlm.c index 65fe76c9f..cc1f7908e 100644 --- a/scst/src/scst_dlm.c +++ b/scst/src/scst_dlm.c @@ -1427,6 +1427,13 @@ static int scst_pr_dlm_init(struct scst_device *dev, const char *cl_dev_id) goto err_free; } + /* + * Instantiate the lockspace such that APTPL registration information + * is also made persistent on this node even if this node does not + * receive any medium or PR SCSI commands. + */ + get_lockspace(dev); + res = 0; out: From f125a4e9bf61a3a4834a5b7437b1dbfce9ba98b9 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 3 Aug 2016 01:43:24 +0000 Subject: [PATCH 2/5] scst: Update README.dlm git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6921 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/README.dlm | 2 -- 1 file changed, 2 deletions(-) diff --git a/scst/README.dlm b/scst/README.dlm index 0d052b4f1..56597a149 100644 --- a/scst/README.dlm +++ b/scst/README.dlm @@ -165,8 +165,6 @@ To do * Ensure that PREEMPT AND ABORT affects all cluster nodes instead of only the cluster node that received this command. - * On APTL bit set, put the PR info on storage on the passive node. - See also -------- From 69863eb497b6ced7419c3e89ddb6cf58cb536ab8 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 3 Aug 2016 02:32:17 +0000 Subject: [PATCH 3/5] Increase version to 3.3 git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6927 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/README | 2 +- iscsi-scst/include/iscsi_scst_ver.h | 2 +- iscsi-scst/kernel/iscsi_trace_flag.h | 2 +- qla2x00t/qla2x00-target/README | 2 +- qla2x00t/qla2x00-target/qla2x00t.h | 2 +- scst/README | 2 +- scst/include/scst_const.h | 2 +- scst/src/dev_handlers/scst_vdisk.c | 2 +- scst_local/scst_local.c | 2 +- srpt/src/ib_srpt.c | 2 +- usr/fileio/README | 2 +- usr/fileio/common.h | 2 +- usr/include/version.h | 2 +- www/downloads.html | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/iscsi-scst/README b/iscsi-scst/README index 74a546018..3889a7a5c 100644 --- a/iscsi-scst/README +++ b/iscsi-scst/README @@ -1,7 +1,7 @@ iSCSI SCST target driver ======================== -Version 3.2.0, XX XXXXX 2014 +Version 3.3.0, XX XXXXX 2016 ---------------------------- ISCSI-SCST is a deeply reworked fork of iSCSI Enterprise Target (IET) diff --git a/iscsi-scst/include/iscsi_scst_ver.h b/iscsi-scst/include/iscsi_scst_ver.h index 4dc77ad01..591dc61a2 100644 --- a/iscsi-scst/include/iscsi_scst_ver.h +++ b/iscsi-scst/include/iscsi_scst_ver.h @@ -21,4 +21,4 @@ #define ISCSI_VERSION_STRING_SUFFIX #endif -#define ISCSI_VERSION_STRING "3.2.0-pre1" ISCSI_VERSION_STRING_SUFFIX +#define ISCSI_VERSION_STRING "3.3.0-pre1" ISCSI_VERSION_STRING_SUFFIX diff --git a/iscsi-scst/kernel/iscsi_trace_flag.h b/iscsi-scst/kernel/iscsi_trace_flag.h index 046edd696..3eea47f81 100644 --- a/iscsi-scst/kernel/iscsi_trace_flag.h +++ b/iscsi-scst/kernel/iscsi_trace_flag.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 - 2014 Vladislav Bolkhovitin + * Copyright (C) 2007 - 2016 Vladislav Bolkhovitin * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/qla2x00t/qla2x00-target/README b/qla2x00t/qla2x00-target/README index bedd1fc12..bdeab9b6a 100644 --- a/qla2x00t/qla2x00-target/README +++ b/qla2x00t/qla2x00-target/README @@ -1,7 +1,7 @@ Target driver for QLogic 2[2-6]xx/8[1-3]xx Fibre Channel cards ============================================================== -Version 3.2.0, XX XXXXX 2015 +Version 3.3.0, XX XXXXX 2016 ---------------------------- This is target driver for QLogic 2[2-6]xx/8[1-3]xx Fibre Channel cards. diff --git a/qla2x00t/qla2x00-target/qla2x00t.h b/qla2x00t/qla2x00-target/qla2x00t.h index 9ebbe431a..723bd54be 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.h +++ b/qla2x00t/qla2x00-target/qla2x00t.h @@ -31,7 +31,7 @@ /* 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(4, 1, 0, 0) -#define Q2T_VERSION_STRING "3.2.0-pre1" +#define Q2T_VERSION_STRING "3.3.0-pre1" #define Q2T_PROC_VERSION_NAME "version" #define Q2T_MAX_CDB_LEN 16 diff --git a/scst/README b/scst/README index 9f4aac4ac..41bc0576a 100644 --- a/scst/README +++ b/scst/README @@ -1,7 +1,7 @@ Generic SCSI target mid-level for Linux (SCST) ============================================== -Version 3.2.0, XX XXXXX 2015 +Version 3.3.0, XX XXXXX 2014 ---------------------------- SCST is designed to provide unified, consistent interface between SCSI diff --git a/scst/include/scst_const.h b/scst/include/scst_const.h index 30c8f5115..eaee44233 100644 --- a/scst/include/scst_const.h +++ b/scst/include/scst_const.h @@ -50,7 +50,7 @@ #else #define SCST_VERSION_STRING_SUFFIX #endif -#define SCST_VERSION_NAME "3.2.0-pre1" +#define SCST_VERSION_NAME "3.3.0-pre1" #define SCST_VERSION_STRING SCST_VERSION_NAME SCST_VERSION_STRING_SUFFIX #define SCST_CONST_VERSION SCST_CONST_INTF_VER diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index c18a0ad6f..ae2798a4d 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -83,7 +83,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 " 320" +#define SCST_FIO_REV " 330" #define MAX_USN_LEN (20+1) /* For '\0' */ #define MAX_INQ_VEND_SPECIFIC_LEN (INQ_BUF_SZ - 96) diff --git a/scst_local/scst_local.c b/scst_local/scst_local.c index b545a3951..c0c0207e3 100644 --- a/scst_local/scst_local.c +++ b/scst_local/scst_local.c @@ -88,7 +88,7 @@ static unsigned long scst_local_trace_flag = SCST_LOCAL_DEFAULT_LOG_FLAGS; #define scsi_bufflen(cmd) ((cmd)->request_bufflen) #endif -#define SCST_LOCAL_VERSION "3.2" +#define SCST_LOCAL_VERSION "3.3" static const char *scst_local_version_date = "20110901"; /* Some statistics */ diff --git a/srpt/src/ib_srpt.c b/srpt/src/ib_srpt.c index ebe5a2901..40a510349 100644 --- a/srpt/src/ib_srpt.c +++ b/srpt/src/ib_srpt.c @@ -80,7 +80,7 @@ /* Name of this kernel module. */ #define DRV_NAME "ib_srpt" -#define DRV_VERSION "3.2.0-pre#" __stringify(OFED_FLAVOR) +#define DRV_VERSION "3.3.0-pre#" __stringify(OFED_FLAVOR) #define DRV_RELDATE "(not yet released)" #if defined(CONFIG_SCST_DEBUG) || defined(CONFIG_SCST_TRACING) /* Flags to be used in SCST debug tracing statements. */ diff --git a/usr/fileio/README b/usr/fileio/README index 31975bec8..ed988fe5c 100644 --- a/usr/fileio/README +++ b/usr/fileio/README @@ -1,7 +1,7 @@ User space FILEIO handler ========================= -Version 3.2.0, XX XXXXX 2014 +Version 3.3.0, XX XXXXX 2016 ---------------------------- User space program fileio_tgt uses interface of SCST's scst_user dev diff --git a/usr/fileio/common.h b/usr/fileio/common.h index 070373745..7c1bf6239 100644 --- a/usr/fileio/common.h +++ b/usr/fileio/common.h @@ -30,7 +30,7 @@ /* 8 byte ASCII Vendor */ #define VENDOR "SCST_USR" /* 4 byte ASCII Product Revision Level - left aligned */ -#define FIO_REV " 320" +#define FIO_REV " 330" #define MAX_USN_LEN (20+1) /* For '\0' */ diff --git a/usr/include/version.h b/usr/include/version.h index 0984dc562..b1c66715b 100644 --- a/usr/include/version.h +++ b/usr/include/version.h @@ -19,6 +19,6 @@ #ifndef __VERSION_H #define __VERSION_H -#define VERSION_STR "3.2.0-pre1" +#define VERSION_STR "3.3.0-pre1" #endif /* __VERSION_H */ diff --git a/www/downloads.html b/www/downloads.html index 79e60c0be..940abb502 100644 --- a/www/downloads.html +++ b/www/downloads.html @@ -51,7 +51,7 @@ NOTE! Both those projects are very early in the development process, so not recommended for production use yet.

-

The latest development version of SCST is 3.2. You can download it as well as target drivers and user space +

The latest development version of SCST is 3.3. You can download it as well as target drivers and user space utilities directly from the SCST SVN. You can access it using either web-based SVN repository viewer or using anonymous access:

From 830fe47378c88c8dee0eaa16f0c42a151f53f92a Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 3 Aug 2016 02:33:56 +0000 Subject: [PATCH 4/5] Update SVN_TAGS git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6928 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- SVN_TAGS | 1 + 1 file changed, 1 insertion(+) diff --git a/SVN_TAGS b/SVN_TAGS index 0e234d912..5666e0680 100644 --- a/SVN_TAGS +++ b/SVN_TAGS @@ -21,3 +21,4 @@ SRPT 1.0.0 450 3.0.0 5815 on the 3.0.x branch 3.1.x branch start 6591, which is a copy of trunk r6590 3.1.0 6783 on the 3.1.x branch +3.2.x branch start 6925, which is a copy of trunk r6921 From ce52affcdf8dc1e1c722c80a8abfeca94ed6de57 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 3 Aug 2016 02:49:31 +0000 Subject: [PATCH 5/5] scst_vdisk: don't report unmap alignment, if it is equal to unmap granularity git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6930 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scst/src/dev_handlers/scst_vdisk.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c index ae2798a4d..24d970669 100644 --- a/scst/src/dev_handlers/scst_vdisk.c +++ b/scst/src/dev_handlers/scst_vdisk.c @@ -1062,6 +1062,8 @@ check: (defined(RHEL_MAJOR) && RHEL_MAJOR -0 >= 6) virt_dev->unmap_opt_gran = q->limits.discard_granularity >> block_shift; virt_dev->unmap_align = q->limits.discard_alignment >> block_shift; + if (virt_dev->unmap_opt_gran == virt_dev->unmap_align) + virt_dev->unmap_align = 0; virt_dev->unmap_max_lba_cnt = q->limits.max_discard_sectors >> (block_shift - 9); virt_dev->discard_zeroes_data = q->limits.discard_zeroes_data; #else