diff --git a/iscsi-full_perf.patch b/iscsi-full_perf.patch index 6f64b5693..b415d5d79 100644 --- a/iscsi-full_perf.patch +++ b/iscsi-full_perf.patch @@ -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 -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter #EXTRA_CFLAGS += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES diff --git a/iscsi-release.patch b/iscsi-release.patch index 328900b94..b462ac508 100644 --- a/iscsi-release.patch +++ b/iscsi-release.patch @@ -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 +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +EXTRA_CFLAGS += -DCONFIG_SCST_TRACING -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter #EXTRA_CFLAGS += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES diff --git a/iscsi-scst/include/iscsi_scst.h b/iscsi-scst/include/iscsi_scst.h index 66cb940d9..9c7bc3cd9 100644 --- a/iscsi-scst/include/iscsi_scst.h +++ b/iscsi-scst/include/iscsi_scst.h @@ -104,8 +104,8 @@ struct iscsi_param_info { u32 param_type; u32 partial; - u32 session_param[session_key_last]; - u32 target_param[target_key_last]; + s32 session_param[session_key_last]; + s32 target_param[target_key_last]; }; enum iscsi_event_state { diff --git a/iscsi-scst/kernel/Makefile b/iscsi-scst/kernel/Makefile index d0408f73b..18e3803a2 100644 --- a/iscsi-scst/kernel/Makefile +++ b/iscsi-scst/kernel/Makefile @@ -25,7 +25,7 @@ EXTRA_CFLAGS += -I$(src)/../include -I$(SCST_INC_DIR) EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING -EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g +EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter #EXTRA_CFLAGS += -DCONFIG_SCST_ISCSI_DEBUG_DIGEST_FAILURES diff --git a/iscsi-scst/kernel/param.c b/iscsi-scst/kernel/param.c index 6b02f0fdf..fef754f49 100644 --- a/iscsi-scst/kernel/param.c +++ b/iscsi-scst/kernel/param.c @@ -91,13 +91,13 @@ static void log_params(struct iscsi_sess_param *param) /* target_mutex supposed to be locked */ static void sess_param_check(struct iscsi_param_info *info) { - u32 *iparam = info->session_param; + s32 *iparam = info->session_param; CHECK_PARAM(info, iparam, max_connections, 1, 1); CHECK_PARAM(info, iparam, max_recv_data_length, 512, - (u32) (ISCSI_CONN_IOV_MAX * PAGE_SIZE)); + (s32) (ISCSI_CONN_IOV_MAX * PAGE_SIZE)); CHECK_PARAM(info, iparam, max_xmit_data_length, 512, - (u32) (ISCSI_CONN_IOV_MAX * PAGE_SIZE)); + (s32) (ISCSI_CONN_IOV_MAX * PAGE_SIZE)); CHECK_PARAM(info, iparam, error_recovery_level, 0, 0); CHECK_PARAM(info, iparam, data_pdu_inorder, 0, 1); CHECK_PARAM(info, iparam, data_sequence_inorder, 0, 1); diff --git a/iscsi-scst/usr/types.h b/iscsi-scst/usr/types.h index 308c66871..a14c91453 100644 --- a/iscsi-scst/usr/types.h +++ b/iscsi-scst/usr/types.h @@ -42,4 +42,6 @@ typedef u_int16_t u16; typedef u_int32_t u32; typedef u_int64_t u64; +typedef int32_t s32; + #endif /* TYPES_H */ diff --git a/qla2x00t-full_perf.patch b/qla2x00t-full_perf.patch index 144774bfa..e8ea4aae1 100644 --- a/qla2x00t-full_perf.patch +++ b/qla2x00t-full_perf.patch @@ -9,8 +9,8 @@ Index: qla2x00t/qla2x00-target/Makefile -EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DDEBUG_TGT -g -+#EXTRA_CFLAGS += -DDEBUG_TGT -g +-EXTRA_CFLAGS += -DDEBUG_TGT -g -W -Wno-unused-parameter ++#EXTRA_CFLAGS += -DDEBUG_TGT -g -W -Wno-unused-parameter #EXTRA_CFLAGS += -DDEBUG_WORK_IN_THREAD ifeq ($(KVER),) diff --git a/qla2x00t-release.patch b/qla2x00t-release.patch index e98662e5d..0284c7bbf 100644 --- a/qla2x00t-release.patch +++ b/qla2x00t-release.patch @@ -8,10 +8,10 @@ Index: qla2x00t/qla2x00-target/Makefile -EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS -#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DDEBUG_TGT -g +-EXTRA_CFLAGS += -DDEBUG_TGT -g -W -Wno-unused-parameter +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS +EXTRA_CFLAGS += -DCONFIG_SCST_TRACING -+#EXTRA_CFLAGS += -DDEBUG_TGT -g ++#EXTRA_CFLAGS += -DDEBUG_TGT -g -W -Wno-unused-parameter #EXTRA_CFLAGS += -DDEBUG_WORK_IN_THREAD ifeq ($(KVER),) diff --git a/qla2x00t/qla2x00-target/Makefile b/qla2x00t/qla2x00-target/Makefile index ca2ffd643..97a6364c4 100644 --- a/qla2x00t/qla2x00-target/Makefile +++ b/qla2x00t/qla2x00-target/Makefile @@ -37,7 +37,7 @@ INSTALL_DIR := /lib/modules/$(shell uname -r)/extra EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING -EXTRA_CFLAGS += -DDEBUG_TGT -g +EXTRA_CFLAGS += -DDEBUG_TGT -g -W -Wno-unused-parameter #EXTRA_CFLAGS += -DDEBUG_WORK_IN_THREAD ifeq ($(KVER),) diff --git a/qla2x00t/qla2x00-target/qla2x00t.c b/qla2x00t/qla2x00-target/qla2x00t.c index b08c66bf0..24777145b 100644 --- a/qla2x00t/qla2x00-target/qla2x00t.c +++ b/qla2x00t/qla2x00-target/qla2x00t.c @@ -674,7 +674,7 @@ static int q2t_xmit_response(struct scst_cmd *scst_cmd) struct q2t_sess *sess; int is_send_status; unsigned long flags = 0; - struct q2t_prm prm = { 0 }; + struct q2t_prm prm; int data_sense_flag = 0; uint16_t full_req_cnt; @@ -686,6 +686,8 @@ static int q2t_xmit_response(struct scst_cmd *scst_cmd) return SCST_TGT_RES_NEED_THREAD_CTX; #endif + memset(&prm, 0, sizeof(prm)); + prm.cmd = (struct q2t_cmd *)scst_cmd_get_tgt_priv(scst_cmd); sess = (struct q2t_sess *) scst_sess_get_tgt_priv(scst_cmd_get_session(scst_cmd)); @@ -831,7 +833,7 @@ static int q2t_rdy_to_xfer(struct scst_cmd *scst_cmd) int res = SCST_TGT_RES_SUCCESS; struct q2t_sess *sess; unsigned long flags = 0; - struct q2t_prm prm = { 0 }; + struct q2t_prm prm; TRACE_ENTRY(); TRACE(TRACE_SCSI, "tag=%Ld", scst_cmd_get_tag(scst_cmd)); @@ -841,6 +843,8 @@ static int q2t_rdy_to_xfer(struct scst_cmd *scst_cmd) return SCST_TGT_RES_NEED_THREAD_CTX; #endif + memset(&prm, 0, sizeof(prm)); + prm.cmd = (struct q2t_cmd *)scst_cmd_get_tgt_priv(scst_cmd); sess = (struct q2t_sess *) scst_sess_get_tgt_priv(scst_cmd_get_session(scst_cmd)); diff --git a/scst-full_perf.patch b/scst-full_perf.patch index 0a29f7d59..8634f76d4 100644 --- a/scst-full_perf.patch +++ b/scst-full_perf.patch @@ -15,8 +15,8 @@ Index: scst/src/Makefile #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g +-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_TM -UCONFIG_SCST_TM_DBG_GO_OFFLINE #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_RETRY #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_OOM @@ -32,8 +32,8 @@ Index: scst/src/dev_handlers/Makefile +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter clean: rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \ diff --git a/scst-release.patch b/scst-release.patch index 87c2ab713..e3e8bbeec 100644 --- a/scst-release.patch +++ b/scst-release.patch @@ -18,8 +18,8 @@ Index: scst/src/Makefile -#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING +EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g +-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_TM -UCONFIG_SCST_TM_DBG_GO_OFFLINE #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_RETRY #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_OOM @@ -35,9 +35,9 @@ Index: scst/src/dev_handlers/Makefile +#EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS -#EXTRA_CFLAGS += -DCONFIG_SCST_TRACING --EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g +-EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter +EXTRA_CFLAGS += -DCONFIG_SCST_TRACING -+#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g ++#EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter clean: rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \ diff --git a/scst/src/Makefile b/scst/src/Makefile index ce567e38c..6a0e8a43b 100644 --- a/scst/src/Makefile +++ b/scst/src/Makefile @@ -125,7 +125,7 @@ EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING -EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g +EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_TM -UCONFIG_SCST_TM_DBG_GO_OFFLINE #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_RETRY #EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG_OOM diff --git a/scst/src/dev_handlers/Makefile b/scst/src/dev_handlers/Makefile index 0d92d914b..2cee73496 100644 --- a/scst/src/dev_handlers/Makefile +++ b/scst/src/dev_handlers/Makefile @@ -72,7 +72,7 @@ EXTRA_CFLAGS += -I$(SUBDIRS) -I$(SCST_INC_DIR) -Wextra -Wno-unused-parameter EXTRA_CFLAGS += -DCONFIG_SCST_EXTRACHECKS #EXTRA_CFLAGS += -DCONFIG_SCST_TRACING -EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g +EXTRA_CFLAGS += -DCONFIG_SCST_DEBUG -g -W -Wno-unused-parameter clean: rm -f *.o *.ko .*.cmd *.mod.c .*.d .depend Modules.symvers \ diff --git a/usr-full_perf.patch b/usr-full_perf.patch index 05673c3ea..71e45a543 100644 --- a/usr-full_perf.patch +++ b/usr-full_perf.patch @@ -9,8 +9,8 @@ Index: usr/fileio/Makefile -CFLAGS += -DEXTRACHECKS +#CFLAGS += -DEXTRACHECKS #CFLAGS += -DTRACING --CFLAGS += -DDEBUG -g -+#CFLAGS += -DDEBUG -g +-CFLAGS += -DDEBUG -g -W -Wno-unused-parameter ++#CFLAGS += -DDEBUG -g -W -Wno-unused-parameter #CFLAGS += -DDEBUG_NOMEM #CFLAGS += -DDEBUG_SENSE diff --git a/usr-release.patch b/usr-release.patch index 80cc3d17e..cf03c3503 100644 --- a/usr-release.patch +++ b/usr-release.patch @@ -8,10 +8,10 @@ Index: usr/fileio/Makefile -CFLAGS += -DEXTRACHECKS -#CFLAGS += -DTRACING --CFLAGS += -DDEBUG -g +-CFLAGS += -DDEBUG -g -W -Wno-unused-parameter +#CFLAGS += -DEXTRACHECKS +CFLAGS += -DTRACING -+#CFLAGS += -DDEBUG -g ++#CFLAGS += -DDEBUG -g -W -Wno-unused-parameter #CFLAGS += -DDEBUG_NOMEM #CFLAGS += -DDEBUG_SENSE diff --git a/usr/fileio/Makefile b/usr/fileio/Makefile index 91cf5c7e6..9c74d347f 100644 --- a/usr/fileio/Makefile +++ b/usr/fileio/Makefile @@ -32,7 +32,7 @@ LIBS = -lpthread CFLAGS += -DEXTRACHECKS #CFLAGS += -DTRACING -CFLAGS += -DDEBUG -g +CFLAGS += -DDEBUG -g -W -Wno-unused-parameter #CFLAGS += -DDEBUG_NOMEM #CFLAGS += -DDEBUG_SENSE