mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-19 03:31:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2015-06-17 05:51:43 -07:00
parent e89dfca7e4 46915ef3e5
commit 97d28a6fc8
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
iscsi-scst/kernel/iscsi.c
View File

@@ -2329,12 +2329,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));

2
iscsi-scst/kernel/iscsi.h
View File

@@ -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;