From 3e9eaf6b29c0aec0640cd8f31d7970b54601f59b Mon Sep 17 00:00:00 2001 From: Vladislav Bolkhovitin Date: Tue, 16 Jun 2015 01:43:26 +0000 Subject: [PATCH] iscsi-scst: small post-r6315 cleanup Avoid that rd_task when it is not used git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6317 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/iscsi.c | 8 ++++++-- iscsi-scst/kernel/iscsi.h | 2 ++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index 3cfd136f1..30df54f9d 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -2321,8 +2321,12 @@ static void __cmnd_abort(struct iscsi_cmnd *cmnd) cmnd->r2t_len_to_send, cmnd_scsicode(cmnd), cmnd_write_size(cmnd), cmnd->outstanding_r2t, cmnd->conn->session->exp_cmd_sn, cmnd->conn, - cmnd->conn->rd_task, cmnd->conn->read_cmnd, - cmnd->conn->read_state); +#ifdef CONFIG_SCST_EXTRACHECKS + cmnd->conn->rd_task, +#else + NULL, +#endif + cmnd->conn->read_cmnd, cmnd->conn->read_state); #if defined(CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION) TRACE_MGMT_DBG("net_ref_cnt %d", atomic_read(&cmnd->net_ref_cnt)); diff --git a/iscsi-scst/kernel/iscsi.h b/iscsi-scst/kernel/iscsi.h index 5875fbd2a..908068bd0 100644 --- a/iscsi-scst/kernel/iscsi.h +++ b/iscsi-scst/kernel/iscsi.h @@ -280,7 +280,9 @@ struct iscsi_conn { struct list_head rd_list_entry; +#ifdef CONFIG_SCST_EXTRACHECKS struct task_struct *rd_task; +#endif unsigned long last_rcv_time;