From 8c71b682710972fb75dbfcea7b5cca0cc173abed Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Wed, 9 Jul 2008 16:44:01 +0000 Subject: [PATCH] - Version changed to 1.0.1 - Switched back to the debug mode git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@442 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-full_perf.patch | 2 +- iscsi-release.patch | 2 +- iscsi-scst/README | 4 ++-- iscsi-scst/include/iscsi_scst_ver.h | 2 +- iscsi-scst/kernel/Makefile | 6 +++--- qla2x00t/qla2x00-target/ChangeLog | 5 +++++ qla2x00t/qla2x00-target/Makefile | 6 +++--- qla2x00t/qla2x00-target/README | 2 +- qla2x00t/qla2x00-target/qla2x00t.h | 2 +- qla_isp/linux/isp_pci.c | 2 +- qla_isp/linux/isp_scst.c | 2 +- scst/ChangeLog | 5 +++++ scst/README | 2 +- scst/include/scst.h | 4 ++-- scst/include/scst_user.h | 2 +- scst/src/Makefile | 6 +++--- scst/src/dev_handlers/Makefile | 6 +++--- scstadmin/scstadmin | 2 +- usr-full_perf.patch | 2 +- usr-release.patch | 2 +- usr/fileio/Makefile | 6 +++--- usr/fileio/README | 2 +- usr/fileio/fileio.c | 2 +- 23 files changed, 43 insertions(+), 33 deletions(-) diff --git a/iscsi-full_perf.patch b/iscsi-full_perf.patch index 3998cdb5f..09c3b918f 100644 --- a/iscsi-full_perf.patch +++ b/iscsi-full_perf.patch @@ -2,7 +2,7 @@ Index: iscsi-scst/kernel/Makefile =================================================================== --- iscsi-scst/kernel/Makefile (revision 324) +++ iscsi-scst/kernel/Makefile (working copy) -@@ -26,9 +26,9 @@ SCST_INC_DIR := $(SUBDIRS)/../../scst/in +@@ -23,9 +23,9 @@ SCST_INC_DIR := $(SUBDIRS)/../../scst/in EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR) # -Wextra -Wno-unused-parameter diff --git a/iscsi-release.patch b/iscsi-release.patch index c92e4c234..2904664df 100644 --- a/iscsi-release.patch +++ b/iscsi-release.patch @@ -2,7 +2,7 @@ Index: iscsi-scst/kernel/Makefile =================================================================== --- iscsi-scst/kernel/Makefile (revision 324) +++ iscsi-scst/kernel/Makefile (working copy) -@@ -26,9 +26,9 @@ SCST_INC_DIR := $(SUBDIRS)/../../scst/in +@@ -23,9 +23,9 @@ SCST_INC_DIR := $(SUBDIRS)/../../scst/in EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR) # -Wextra -Wno-unused-parameter diff --git a/iscsi-scst/README b/iscsi-scst/README index 6d06176a9..5f2a33ee6 100644 --- a/iscsi-scst/README +++ b/iscsi-scst/README @@ -1,8 +1,8 @@ iSCSI SCST target driver ======================== -Version 1.0.0/0.4.16r155, 7 July 2008 -------------------------------------- +Version 1.0.1/0.4.16r155, XX XXXX 2008 +-------------------------------------- This driver is a forked with all respects version of iSCSI Enterprise Target (IET) (http://iscsitarget.sourceforge.net/) with updates to work diff --git a/iscsi-scst/include/iscsi_scst_ver.h b/iscsi-scst/include/iscsi_scst_ver.h index 2e464ef47..b38197845 100644 --- a/iscsi-scst/include/iscsi_scst_ver.h +++ b/iscsi-scst/include/iscsi_scst_ver.h @@ -13,4 +13,4 @@ * GNU General Public License for more details. */ -#define ISCSI_VERSION_STRING "1.0.0/0.4.16r155" +#define ISCSI_VERSION_STRING "1.0.1/0.4.16r155" diff --git a/iscsi-scst/kernel/Makefile b/iscsi-scst/kernel/Makefile index 76c11e865..956d718a2 100644 --- a/iscsi-scst/kernel/Makefile +++ b/iscsi-scst/kernel/Makefile @@ -23,9 +23,9 @@ EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR) # -Wextra -Wno-unused-parameter -#EXTRA_CFLAGS += -DEXTRACHECKS -EXTRA_CFLAGS += -DTRACING -#EXTRA_CFLAGS += -DDEBUG -g +EXTRA_CFLAGS += -DEXTRACHECKS +#EXTRA_CFLAGS += -DTRACING +EXTRA_CFLAGS += -DDEBUG -g #EXTRA_CFLAGS += -DDEBUG_DIGEST_FAILURES diff --git a/qla2x00t/qla2x00-target/ChangeLog b/qla2x00t/qla2x00-target/ChangeLog index 5b326b5bb..866f1d057 100644 --- a/qla2x00t/qla2x00-target/ChangeLog +++ b/qla2x00t/qla2x00-target/ChangeLog @@ -1,3 +1,8 @@ +Summary of changes between versions 1.0.0 and 1.0.1 +--------------------------------------------------- + + + Summary of changes between versions 0.9.5 and 1.0.0 --------------------------------------------------- diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile index 26240e133..abd1b6398 100644 --- a/qla2x00t/qla2x00-target/Makefile +++ b/qla2x00t/qla2x00-target/Makefile @@ -35,9 +35,9 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -DFC_TARGET_SUPPORT INSTALL_DIR := /lib/modules/$(shell uname -r)/extra -#EXTRA_CFLAGS += -DEXTRACHECKS -EXTRA_CFLAGS += -DTRACING -#EXTRA_CFLAGS += -DDEBUG_TGT -g +EXTRA_CFLAGS += -DEXTRACHECKS +#EXTRA_CFLAGS += -DTRACING +EXTRA_CFLAGS += -DDEBUG_TGT -g #EXTRA_CFLAGS += -DDEBUG_WORK_IN_THREAD ifeq ($(KVER),) diff --git a/qla2x00t/qla2x00-target/README b/qla2x00t/qla2x00-target/README index 33e5108f5..13ab1396a 100644 --- a/qla2x00t/qla2x00-target/README +++ b/qla2x00t/qla2x00-target/README @@ -1,7 +1,7 @@ Target driver for Qlogic 2200/2300 Fibre Channel cards ====================================================== -Version 1.0.0, 7 July 2008 +Version 1.0.1, X XXXX 2008 -------------------------- This driver has all required features and looks to be quite stable (for diff --git a/qla2x00t/qla2x00-target/qla2x00t.h b/qla2x00t/qla2x00-target/qla2x00t.h index a794e935d..deba9d8ef 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.h +++ b/qla2x00t/qla2x00-target/qla2x00t.h @@ -38,7 +38,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(1,0,0,0) -#define Q2T_VERSION_STRING "1.0.0" +#define Q2T_VERSION_STRING "1.0.1" #define Q2T_MAX_CDB_LEN 16 #define Q2T_TIMEOUT 10 /* in seconds */ diff --git a/qla_isp/linux/isp_pci.c b/qla_isp/linux/isp_pci.c index 2e404cdd5..d5cffdd16 100644 --- a/qla_isp/linux/isp_pci.c +++ b/qla_isp/linux/isp_pci.c @@ -548,7 +548,7 @@ isplinux_pci_init_one(struct Scsi_Host *host) if (isp_debug) { isp->isp_dblev = isp_debug; } else { - isp->isp_dblev = ISP_LOGERR; + isp->isp_dblev = ISP_LOGCONFIG|ISP_LOGINFO|ISP_LOGWARN|ISP_LOGERR; } pci_read_config_word(pdev, PCI_COMMAND, &cmd); diff --git a/qla_isp/linux/isp_scst.c b/qla_isp/linux/isp_scst.c index 39dfe89c7..29f8e7dbe 100644 --- a/qla_isp/linux/isp_scst.c +++ b/qla_isp/linux/isp_scst.c @@ -156,7 +156,7 @@ struct bus { struct scst_proc_data proc_data; }; -//#define DEBUG 1 +#define DEBUG 1 #ifdef DEBUG #define SDprintk if (debug) printk diff --git a/scst/ChangeLog b/scst/ChangeLog index d7b174a51..657516fab 100644 --- a/scst/ChangeLog +++ b/scst/ChangeLog @@ -1,3 +1,8 @@ +Summary of changes between versions 1.0.0 and 1.0.1 +--------------------------------------------------- + + + Summary of changes between versions 0.9.5 and 1.0.0 --------------------------------------------------- diff --git a/scst/README b/scst/README index 2301a6dd1..84455513d 100644 --- a/scst/README +++ b/scst/README @@ -1,7 +1,7 @@ Generic SCSI target mid-level for Linux (SCST) ============================================== -Version 1.0.0, 7 July 2008 +Version 1.0.1, X XXXX 2008 -------------------------- SCST is designed to provide unified, consistent interface between SCSI diff --git a/scst/include/scst.h b/scst/include/scst.h index dd310562b..56b4524ca 100644 --- a/scst/include/scst.h +++ b/scst/include/scst.h @@ -48,9 +48,9 @@ typedef _Bool bool; #endif /* Version numbers, the same as for the kernel */ -#define SCST_VERSION_CODE 0x01000000 +#define SCST_VERSION_CODE 0x01000100 #define SCST_VERSION(a, b, c, d) (((a) << 24) + ((b) << 16) + ((c) << 8) + d) -#define SCST_VERSION_STRING "1.0.0" +#define SCST_VERSION_STRING "1.0.1" #define SCST_INTERFACE_VERSION SCST_VERSION_STRING "$Revision$" SCST_CONST_VERSION /************************************************************* diff --git a/scst/include/scst_user.h b/scst/include/scst_user.h index d968f9ba2..88e89e6c0 100644 --- a/scst/include/scst_user.h +++ b/scst/include/scst_user.h @@ -26,7 +26,7 @@ #define DEV_USER_NAME "scst_user" #define DEV_USER_PATH "/dev/" -#define DEV_USER_VERSION_NAME "1.0.0" +#define DEV_USER_VERSION_NAME "1.0.1" #define DEV_USER_VERSION DEV_USER_VERSION_NAME "$Revision$" SCST_CONST_VERSION /* diff --git a/scst/src/Makefile b/scst/src/Makefile index 57a9a6623..d182ccc40 100644 --- a/scst/src/Makefile +++ b/scst/src/Makefile @@ -115,7 +115,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter #EXTRA_CFLAGS += -DSTRICT_SERIALIZING -#EXTRA_CFLAGS += -DEXTRACHECKS +EXTRA_CFLAGS += -DEXTRACHECKS #EXTRA_CFLAGS += -DUSE_EXPECTED_VALUES #EXTRA_CFLAGS += -DALLOW_PASSTHROUGH_IO_SUBMIT_IN_SIRQ @@ -123,9 +123,9 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter #EXTRA_CFLAGS += -fno-inline -EXTRA_CFLAGS += -DTRACING +#EXTRA_CFLAGS += -DTRACING -#EXTRA_CFLAGS += -DDEBUG -g +EXTRA_CFLAGS += -DDEBUG -g #EXTRA_CFLAGS += -DDEBUG_TM -DTM_DBG_GO_OFFLINE=0 #EXTRA_CFLAGS += -DDEBUG_RETRY #EXTRA_CFLAGS += -DDEBUG_OOM diff --git a/scst/src/dev_handlers/Makefile b/scst/src/dev_handlers/Makefile index e43d8a85f..b12ee5b32 100644 --- a/scst/src/dev_handlers/Makefile +++ b/scst/src/dev_handlers/Makefile @@ -69,10 +69,10 @@ endif EXTRA_CFLAGS += -I$(SUBDIRS) -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter -#EXTRA_CFLAGS += -DEXTRACHECKS +EXTRA_CFLAGS += -DEXTRACHECKS -EXTRA_CFLAGS += -DTRACING -#EXTRA_CFLAGS += -DDEBUG -g +#EXTRA_CFLAGS += -DTRACING +EXTRA_CFLAGS += -DDEBUG -g clean: rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \ diff --git a/scstadmin/scstadmin b/scstadmin/scstadmin index 4a809174b..1f74e4593 100755 --- a/scstadmin/scstadmin +++ b/scstadmin/scstadmin @@ -1,5 +1,5 @@ #!/usr/bin/perl -$Version = 'SCST Configurator v1.0.0'; +$Version = 'SCST Configurator v1.0.1'; # Configures SCST # diff --git a/usr-full_perf.patch b/usr-full_perf.patch index 36dffbd62..05673c3ea 100644 --- a/usr-full_perf.patch +++ b/usr-full_perf.patch @@ -2,7 +2,7 @@ Index: usr/fileio/Makefile =================================================================== --- usr/fileio/Makefile (revision 324) +++ usr/fileio/Makefile (working copy) -@@ -29,9 +29,9 @@ CFLAGS += -O2 -Wall -Wextra -Wno-unused- +@@ -30,9 +30,9 @@ CFLAGS += -O2 -Wall -Wextra -Wno-unused- PROGS = fileio_tgt LIBS = -lpthread diff --git a/usr-release.patch b/usr-release.patch index ef9c7c769..80cc3d17e 100644 --- a/usr-release.patch +++ b/usr-release.patch @@ -2,7 +2,7 @@ Index: usr/fileio/Makefile =================================================================== --- usr/fileio/Makefile (revision 324) +++ usr/fileio/Makefile (working copy) -@@ -29,9 +29,9 @@ CFLAGS += -O2 -Wall -Wextra -Wno-unused- +@@ -30,9 +30,9 @@ CFLAGS += -O2 -Wall -Wextra -Wno-unused- PROGS = fileio_tgt LIBS = -lpthread diff --git a/usr/fileio/Makefile b/usr/fileio/Makefile index 1bdb67813..e89f440d2 100644 --- a/usr/fileio/Makefile +++ b/usr/fileio/Makefile @@ -30,9 +30,9 @@ CFLAGS += -O2 -Wall -Wextra -Wno-unused-parameter -Wstrict-prototypes \ PROGS = fileio_tgt LIBS = -lpthread -#CFLAGS += -DEXTRACHECKS -CFLAGS += -DTRACING -#CFLAGS += -DDEBUG -g +CFLAGS += -DEXTRACHECKS +#CFLAGS += -DTRACING +CFLAGS += -DDEBUG -g #CFLAGS += -DDEBUG_NOMEM #CFLAGS += -DDEBUG_SENSE diff --git a/usr/fileio/README b/usr/fileio/README index d4b7513c7..237f2ca8c 100644 --- a/usr/fileio/README +++ b/usr/fileio/README @@ -1,7 +1,7 @@ User space FILEIO handler ========================= -Version 1.0.0, 7 July 2008 +Version 1.0.1, X XXXX 2008 -------------------------- User space program fileio_tgt uses interface of SCST's scst_user dev diff --git a/usr/fileio/fileio.c b/usr/fileio/fileio.c index 6da2829a2..3a8818933 100644 --- a/usr/fileio/fileio.c +++ b/usr/fileio/fileio.c @@ -66,7 +66,7 @@ unsigned long trace_flag = DEFAULT_LOG_FLAGS; #endif /* defined(DEBUG) || defined(TRACING) */ #define DEF_BLOCK_SHIFT 9 -#define VERSION_STR "1.0.0" +#define VERSION_STR "1.0.1" #define THREADS 7 static struct option const long_options[] =