From 46915ef3e56faa0d4696ecac93c19ebe149c5665 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Wed, 17 Jun 2015 05:00:20 +0000 Subject: [PATCH] iscsi-scst: Fix a syntax error Preprocessor directives are not allowed in argument lists of a macro. This patch reverts r6317. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6393 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- iscsi-scst/kernel/iscsi.c | 8 ++------ iscsi-scst/kernel/iscsi.h | 2 -- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/iscsi-scst/kernel/iscsi.c b/iscsi-scst/kernel/iscsi.c index c01d9636a..39f4de61e 100644 --- a/iscsi-scst/kernel/iscsi.c +++ b/iscsi-scst/kernel/iscsi.c @@ -2321,12 +2321,8 @@ 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, -#ifdef CONFIG_SCST_EXTRACHECKS - cmnd->conn->rd_task, -#else - NULL, -#endif - cmnd->conn->read_cmnd, cmnd->conn->read_state); + cmnd->conn->rd_task, 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 908068bd0..5875fbd2a 100644 --- a/iscsi-scst/kernel/iscsi.h +++ b/iscsi-scst/kernel/iscsi.h @@ -280,9 +280,7 @@ struct iscsi_conn { struct list_head rd_list_entry; -#ifdef CONFIG_SCST_EXTRACHECKS struct task_struct *rd_task; -#endif unsigned long last_rcv_time;