mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-07-25 17:42:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2016-08-02 20:29:39 -07:00
parent 097b7127d5 ce52affcdf
commit 1e468b0a5b
16 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SVN_TAGS
+1
View File
@@ -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
iscsi-scst/README
+1 -1
View File
@@ -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)
iscsi-scst/include/iscsi_scst_ver.h
+1 -1
View File
@@ -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
iscsi-scst/kernel/iscsi_trace_flag.h
+1 -1
View File
@@ -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
qla2x00t/qla2x00-target/README
+1 -1
View File
@@ -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.
qla2x00t/qla2x00-target/qla2x00t.h
+1 -1
View File
@@ -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
scst/README
+1 -1
View File
@@ -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
scst/README.dlm
-2
View File
@@ -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
--------
scst/include/scst_const.h
+1 -1
View File
@@ -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
scst/src/dev_handlers/scst_vdisk.c
+3 -1
View File
@@ -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)
@@ -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
scst/src/scst_dlm.c
+7
View File
@@ -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:
scst_local/scst_local.c
+1 -1
View File
@@ -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 */
srpt/src/ib_srpt.c
+1 -1
View File
@@ -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. */
usr/fileio/README
+1 -1
View File
@@ -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
usr/fileio/common.h
+1 -1
View File
@@ -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' */
usr/include/version.h
+1 -1
View File
@@ -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 */