mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-09-18 22:14:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'svn-trunk'

Browse Source
This commit is contained in:
Bart Van Assche
2015-07-03 06:51:11 -07:00
parent c74a2449c5 1656efe689
commit b2cc848c36
4 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
iscsi-scst/kernel/iscsi.c
+6 -2
View File
@@ -2317,6 +2317,11 @@ static void __cmnd_abort(struct iscsi_cmnd *cmnd)
unsigned long timeout_time = jiffies + ISCSI_TM_DATA_WAIT_TIMEOUT +
ISCSI_ADD_SCHED_TIME;
struct iscsi_conn *conn = cmnd->conn;
#ifdef CONFIG_SCST_EXTRACHECKS
struct task_struct *rdt = cmnd->conn->rd_task;
#else
struct task_struct *rdt = NULL;
#endif
TRACE_MGMT_DBG("Aborting cmd %p, scst_cmd %p (scst state %x, "
"ref_cnt %d, on_write_timeout_list %d, write_start %ld, ITT %x, "
@@ -2330,8 +2335,7 @@ 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);
rdt, 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));
iscsi-scst/kernel/iscsi.h
+2
View File
@@ -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;