From e882fcec37717d1d44879c9e132b4f98ad1d44c4 Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Tue, 18 Nov 2008 18:23:08 +0000 Subject: [PATCH] The patch below fixes sparse warnings about int / unsigned int mismatches in the iscsi-scst source code. This patch has been verified by reviewing it carefully and by verifying the output files of the command scripts/run-regression-tests -k 2.6.27.6. Signed-off-by: Bart Van Assche git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@571 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/digest.c | 2 +- iscsi-scst/kernel/digest.h | 2 +- iscsi-scst/kernel/nthread.c | 4 ++-- iscsi-scst/kernel/param.c | 16 ++++++++-------- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/iscsi-scst/kernel/digest.c b/iscsi-scst/kernel/digest.c index 105151bc4..47943562c 100644 --- a/iscsi-scst/kernel/digest.c +++ b/iscsi-scst/kernel/digest.c @@ -23,7 +23,7 @@ #include "digest.h" #include -void digest_alg_available(unsigned int *val) +void digest_alg_available(int *val) { #if defined(CONFIG_LIBCRC32C_MODULE) || defined(CONFIG_LIBCRC32C) int crc32c = 1; diff --git a/iscsi-scst/kernel/digest.h b/iscsi-scst/kernel/digest.h index 22cdd9d93..786ce4df1 100644 --- a/iscsi-scst/kernel/digest.h +++ b/iscsi-scst/kernel/digest.h @@ -18,7 +18,7 @@ #ifndef __ISCSI_DIGEST_H__ #define __ISCSI_DIGEST_H__ -extern void digest_alg_available(unsigned int *val); +extern void digest_alg_available(int *val); extern int digest_init(struct iscsi_conn *conn); diff --git a/iscsi-scst/kernel/nthread.c b/iscsi-scst/kernel/nthread.c index f9408e4b2..8bbdef748 100644 --- a/iscsi-scst/kernel/nthread.c +++ b/iscsi-scst/kernel/nthread.c @@ -457,9 +457,9 @@ static void close_conn(struct iscsi_conn *conn) "wr_state %d, exp_cmd_sn %u", conn, atomic_read(&conn->conn_ref_cnt), conn->wr_state, session->exp_cmd_sn); -#ifdef CONFIG_SCST_DEBUG + trace_conn_close(conn); -#endif + iscsi_check_closewait(conn); } diff --git a/iscsi-scst/kernel/param.c b/iscsi-scst/kernel/param.c index 6afdae312..588bf1e6e 100644 --- a/iscsi-scst/kernel/param.c +++ b/iscsi-scst/kernel/param.c @@ -94,13 +94,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) { - s32 *iparam = info->session_param; + int32_t *iparam = info->session_param; CHECK_PARAM(info, iparam, max_connections, 1, 1); CHECK_PARAM(info, iparam, max_recv_data_length, 512, - (s32) (ISCSI_CONN_IOV_MAX * PAGE_SIZE)); + (int32_t) (ISCSI_CONN_IOV_MAX * PAGE_SIZE)); CHECK_PARAM(info, iparam, max_xmit_data_length, 512, - (s32) (ISCSI_CONN_IOV_MAX * PAGE_SIZE)); + (int32_t) (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); @@ -116,7 +116,7 @@ static void sess_param_check(struct iscsi_param_info *info) static void sess_param_set(struct iscsi_sess_param *param, struct iscsi_param_info *info) { - u32 *iparam = info->session_param; + int32_t *iparam = info->session_param; SET_PARAM(param, info, iparam, initial_r2t); SET_PARAM(param, info, iparam, immediate_data); @@ -142,7 +142,7 @@ static void sess_param_set(struct iscsi_sess_param *param, static void sess_param_get(struct iscsi_sess_param *param, struct iscsi_param_info *info) { - u32 *iparam = info->session_param; + int32_t *iparam = info->session_param; GET_PARAM(param, info, iparam, initial_r2t); GET_PARAM(param, info, iparam, immediate_data); @@ -168,7 +168,7 @@ static void sess_param_get(struct iscsi_sess_param *param, /* target_mutex supposed to be locked */ static void trgt_param_check(struct iscsi_param_info *info) { - u32 *iparam = info->target_param; + int32_t *iparam = info->target_param; CHECK_PARAM(info, iparam, queued_cmnds, MIN_NR_QUEUED_CMNDS, MAX_NR_QUEUED_CMNDS); @@ -179,7 +179,7 @@ static void trgt_param_set(struct iscsi_target *target, struct iscsi_param_info *info) { struct iscsi_trgt_param *param = &target->trgt_param; - u32 *iparam = info->target_param; + int32_t *iparam = info->target_param; SET_PARAM(param, info, iparam, queued_cmnds); } @@ -188,7 +188,7 @@ static void trgt_param_set(struct iscsi_target *target, static void trgt_param_get(struct iscsi_trgt_param *param, struct iscsi_param_info *info) { - u32 *iparam = info->target_param; + int32_t *iparam = info->target_param; GET_PARAM(param, info, iparam, queued_cmnds); }