From 7782dc0768726706b6612b2624b0c4046f18c44d Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Tue, 28 Oct 2008 20:38:49 +0000 Subject: [PATCH] Release/debug/perf patches updated git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@546 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-full_perf.patch | 6 +++--- iscsi-release.patch | 6 +++--- qla2x00t-full_perf.patch | 10 +++++----- qla2x00t-release.patch | 17 +++++------------ scst-full_perf.patch | 20 ++++++++------------ scst-release.patch | 14 +++++++------- 6 files changed, 31 insertions(+), 42 deletions(-) diff --git a/iscsi-full_perf.patch b/iscsi-full_perf.patch index 55da1cae5..cb663f69e 100644 --- a/iscsi-full_perf.patch +++ b/iscsi-full_perf.patch @@ -1,6 +1,6 @@ Index: iscsi-scst/kernel/Makefile =================================================================== ---- iscsi-scst/kernel/Makefile (revision 542) +--- iscsi-scst/kernel/Makefile (revision 544) +++ iscsi-scst/kernel/Makefile (working copy) @@ -23,9 +23,9 @@ EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR) @@ -9,8 +9,8 @@ Index: iscsi-scst/kernel/Makefile -EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g #EXTRA_CFLAGS += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES diff --git a/iscsi-release.patch b/iscsi-release.patch index 1f62ddb0b..58a75bad6 100644 --- a/iscsi-release.patch +++ b/iscsi-release.patch @@ -1,6 +1,6 @@ Index: iscsi-scst/kernel/Makefile =================================================================== ---- iscsi-scst/kernel/Makefile (revision 542) +--- iscsi-scst/kernel/Makefile (revision 544) +++ iscsi-scst/kernel/Makefile (working copy) @@ -23,9 +23,9 @@ EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR) @@ -8,10 +8,10 @@ Index: iscsi-scst/kernel/Makefile -EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS -#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +EXTRA_CFLAGS += -DCONFIG_SCST_TRACING -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g #EXTRA_CFLAGS += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES diff --git a/qla2x00t-full_perf.patch b/qla2x00t-full_perf.patch index 4cc4c957c..befe6fc3b 100644 --- a/qla2x00t-full_perf.patch +++ b/qla2x00t-full_perf.patch @@ -1,16 +1,16 @@ Index: qla2x00t/qla2x00-target/Makefile =================================================================== ---- qla2x00t/qla2x00-target/Makefile (revision 213) +--- qla2x00t/qla2x00-target/Makefile (revision 545) +++ qla2x00t/qla2x00-target/Makefile (working copy) -@@ -36,9 +36,9 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -DFC_T +@@ -37,9 +37,9 @@ INSTALL_DIR := /lib/modules/$(shell unam - INSTALL_DIR := /lib/modules/$(shell uname -r)/extra + EXTRA_CFLAGS += -W -Wno-unused-parameter -Wno-missing-field-initializers -EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g #EXTRA_CFLAGS += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD ifeq ($(KVER),) diff --git a/qla2x00t-release.patch b/qla2x00t-release.patch index e2fbbe3a4..117fa1d8d 100644 --- a/qla2x00t-release.patch +++ b/qla2x00t-release.patch @@ -1,24 +1,17 @@ Index: qla2x00t/qla2x00-target/Makefile =================================================================== ---- qla2x00t/qla2x00-target/Makefile (revision 542) +--- qla2x00t/qla2x00-target/Makefile (revision 545) +++ qla2x00t/qla2x00-target/Makefile (working copy) -@@ -31,14 +31,14 @@ - SCST_INC_DIR := $(SUBDIRS)/../../scst/include - SCST_DIR := $(shell pwd)/../../scst/src +@@ -37,9 +37,9 @@ INSTALL_DIR := /lib/modules/$(shell unam --EXTRA_CFLAGS += -I$(SCST_INC_DIR) -+EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter \ -+ -Wno-missing-field-initializers - - INSTALL_DIR := /lib/modules/$(shell uname -r)/extra + EXTRA_CFLAGS += -W -Wno-unused-parameter -Wno-missing-field-initializers -EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS -#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter \ -- -Wno-missing-field-initializers +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +EXTRA_CFLAGS += -DCONFIG_SCST_TRACING -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g #EXTRA_CFLAGS += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD ifeq ($(KVER),) diff --git a/scst-full_perf.patch b/scst-full_perf.patch index 385a18a72..63e04259a 100644 --- a/scst-full_perf.patch +++ b/scst-full_perf.patch @@ -1,6 +1,6 @@ Index: scst/src/Makefile =================================================================== ---- scst/src/Makefile (revision 542) +--- scst/src/Makefile (revision 544) +++ scst/src/Makefile (working copy) @@ -116,7 +116,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr @@ -15,29 +15,25 @@ Index: scst/src/Makefile #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_TM -UCONFIG_SCST_TM_DBG_GO_OFFLINE #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_RETRY #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_OOM Index: scst/src/dev_handlers/Makefile =================================================================== ---- scst/src/dev_handlers/Makefile (revision 542) +--- scst/src/dev_handlers/Makefile (revision 544) +++ scst/src/dev_handlers/Makefile (working copy) -@@ -67,13 +67,13 @@ else - INSTALL_DIR := /lib/modules/$(KVER)/extra - endif - --EXTRA_CFLAGS += -I$(SUBDIRS) -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter\ -+EXTRA_CFLAGS += -I$(SUBDIRS) -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter \ +@@ -70,10 +70,10 @@ endif + EXTRA_CFLAGS += -I$(SUBDIRS) -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter \ -Wno-missing-field-initializers -EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g clean: rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \ diff --git a/scst-release.patch b/scst-release.patch index 994b4edbd..832c6e350 100644 --- a/scst-release.patch +++ b/scst-release.patch @@ -1,6 +1,6 @@ Index: scst/src/Makefile =================================================================== ---- scst/src/Makefile (revision 542) +--- scst/src/Makefile (revision 544) +++ scst/src/Makefile (working copy) @@ -116,7 +116,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr @@ -18,26 +18,26 @@ Index: scst/src/Makefile -#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING +EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_TM -UCONFIG_SCST_TM_DBG_GO_OFFLINE #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_RETRY #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_OOM Index: scst/src/dev_handlers/Makefile =================================================================== ---- scst/src/dev_handlers/Makefile (revision 542) +--- scst/src/dev_handlers/Makefile (revision 544) +++ scst/src/dev_handlers/Makefile (working copy) @@ -70,10 +70,10 @@ endif - EXTRA_CFLAGS += -I$(SUBDIRS) -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter\ + EXTRA_CFLAGS += -I$(SUBDIRS) -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter \ -Wno-missing-field-initializers -EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS -#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g +EXTRA_CFLAGS += -DCONFIG_SCST_TRACING -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g clean: rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \