From 905eb033a438989ba1eaa68f5fe883f1ae54b588 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Sat, 25 Oct 2008 18:49:47 +0000 Subject: [PATCH] Release/debug/perf patches updated + cosmetics in scst/src/dev_handlers/Makefile git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@543 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-full_perf.patch | 10 +++++----- iscsi-release.patch | 10 +++++----- qla2x00t-full_perf.patch | 6 +++--- qla2x00t-release.patch | 15 +++++++++++---- scst-full_perf.patch | 24 ++++++++++++++---------- scst-release.patch | 22 +++++++++++----------- scst/src/dev_handlers/Makefile | 2 +- 7 files changed, 50 insertions(+), 39 deletions(-) diff --git a/iscsi-full_perf.patch b/iscsi-full_perf.patch index b415d5d79..55da1cae5 100644 --- a/iscsi-full_perf.patch +++ b/iscsi-full_perf.patch @@ -1,16 +1,16 @@ Index: iscsi-scst/kernel/Makefile =================================================================== ---- iscsi-scst/kernel/Makefile (revision 324) +--- iscsi-scst/kernel/Makefile (revision 542) +++ iscsi-scst/kernel/Makefile (working copy) -@@ -23,9 +23,9 @@ SCST_INC_DIR := $(SUBDIRS)/../../scst/in +@@ -23,9 +23,9 @@ EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR) - # -Wextra -Wno-unused-parameter + EXTRA_CFLAGS += -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 -Wno-unused-parameter -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W #EXTRA_CFLAGS += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES diff --git a/iscsi-release.patch b/iscsi-release.patch index b462ac508..1f62ddb0b 100644 --- a/iscsi-release.patch +++ b/iscsi-release.patch @@ -1,17 +1,17 @@ Index: iscsi-scst/kernel/Makefile =================================================================== ---- iscsi-scst/kernel/Makefile (revision 324) +--- iscsi-scst/kernel/Makefile (revision 542) +++ iscsi-scst/kernel/Makefile (working copy) -@@ -23,9 +23,9 @@ SCST_INC_DIR := $(SUBDIRS)/../../scst/in +@@ -23,9 +23,9 @@ EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR) - # -Wextra -Wno-unused-parameter + EXTRA_CFLAGS += -Wextra -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 +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +EXTRA_CFLAGS += -DCONFIG_SCST_TRACING -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W #EXTRA_CFLAGS += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES diff --git a/qla2x00t-full_perf.patch b/qla2x00t-full_perf.patch index 973839fef..4cc4c957c 100644 --- a/qla2x00t-full_perf.patch +++ b/qla2x00t-full_perf.patch @@ -2,15 +2,15 @@ Index: qla2x00t/qla2x00-target/Makefile =================================================================== --- qla2x00t/qla2x00-target/Makefile (revision 213) +++ qla2x00t/qla2x00-target/Makefile (working copy) -@@ -35,9 +35,9 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -DFC_T +@@ -36,9 +36,9 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -DFC_T INSTALL_DIR := /lib/modules/$(shell uname -r)/extra -EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W #EXTRA_CFLAGS += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD ifeq ($(KVER),) diff --git a/qla2x00t-release.patch b/qla2x00t-release.patch index b8900bbc5..e2fbbe3a4 100644 --- a/qla2x00t-release.patch +++ b/qla2x00t-release.patch @@ -1,17 +1,24 @@ Index: qla2x00t/qla2x00-target/Makefile =================================================================== ---- qla2x00t/qla2x00-target/Makefile (revision 213) +--- qla2x00t/qla2x00-target/Makefile (revision 542) +++ qla2x00t/qla2x00-target/Makefile (working copy) -@@ -35,9 +35,9 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -DFC_T +@@ -31,14 +31,14 @@ + SCST_INC_DIR := $(SUBDIRS)/../../scst/include + SCST_DIR := $(shell pwd)/../../scst/src + +-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 += -DCONFIG_SCST_EXTRACHECKS -#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -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 ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W #EXTRA_CFLAGS += -DCONFIG_QLA_TGT_DEBUG_WORK_IN_THREAD ifeq ($(KVER),) diff --git a/scst-full_perf.patch b/scst-full_perf.patch index 8634f76d4..385a18a72 100644 --- a/scst-full_perf.patch +++ b/scst-full_perf.patch @@ -1,8 +1,8 @@ Index: scst/src/Makefile =================================================================== ---- scst/src/Makefile (revision 233) +--- scst/src/Makefile (revision 542) +++ scst/src/Makefile (working copy) -@@ -115,7 +115,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr +@@ -116,7 +116,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr #EXTRA_CFLAGS += -DCONFIG_SCST_STRICT_SERIALIZING @@ -11,29 +11,33 @@ Index: scst/src/Makefile #EXTRA_CFLAGS += -DCONFIG_SCST_USE_EXPECTED_VALUES #EXTRA_CFLAGS += -DALLOW_PASSTHROUGH_IO_SUBMIT_IN_SIRQ -@@ -125,7 +125,7 @@ EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +@@ -126,7 +126,7 @@ EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECK #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W #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 230) +--- scst/src/dev_handlers/Makefile (revision 542) +++ scst/src/dev_handlers/Makefile (working copy) -@@ -69,10 +69,10 @@ endif +@@ -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\ ++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 -Wno-unused-parameter -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W clean: rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \ diff --git a/scst-release.patch b/scst-release.patch index e3e8bbeec..994b4edbd 100644 --- a/scst-release.patch +++ b/scst-release.patch @@ -1,8 +1,8 @@ Index: scst/src/Makefile =================================================================== ---- scst/src/Makefile (revision 233) +--- scst/src/Makefile (revision 542) +++ scst/src/Makefile (working copy) -@@ -115,7 +115,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr +@@ -116,7 +116,7 @@ EXTRA_CFLAGS += -I$(SCST_INC_DIR) -Wextr #EXTRA_CFLAGS += -DCONFIG_SCST_STRICT_SERIALIZING @@ -11,33 +11,33 @@ Index: scst/src/Makefile #EXTRA_CFLAGS += -DCONFIG_SCST_USE_EXPECTED_VALUES #EXTRA_CFLAGS += -DALLOW_PASSTHROUGH_IO_SUBMIT_IN_SIRQ -@@ -123,9 +123,9 @@ EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +@@ -124,9 +124,9 @@ EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECK #EXTRA_CFLAGS += -fno-inline -#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING +EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W #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 230) +--- scst/src/dev_handlers/Makefile (revision 542) +++ scst/src/dev_handlers/Makefile (working copy) -@@ -69,10 +69,10 @@ endif - - 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 -Wno-unused-parameter +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W +EXTRA_CFLAGS += -DCONFIG_SCST_TRACING -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W clean: rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \ diff --git a/scst/src/dev_handlers/Makefile b/scst/src/dev_handlers/Makefile index 5602e564e..3581b7ba2 100644 --- a/scst/src/dev_handlers/Makefile +++ b/scst/src/dev_handlers/Makefile @@ -67,7 +67,7 @@ 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 \ -Wno-missing-field-initializers EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS