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

8
iscsi-scst/kernel/iscsi.c
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));

2
iscsi-scst/kernel/iscsi.h
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;

8
nightly/conf/nightly.conf
View File

@@ -3,17 +3,17 @@
ABT_DETAILS="x86_64"
ABT_JOBS=5
ABT_KERNELS=" \
4.0.6 \
4.0.7 \
3.19.7-nc \
3.18.8-nc \
3.17.8-nc \
3.16.7-nc \
3.15.10-nc \
3.14.45-nc \
3.14.46-nc \
3.13.11-nc \
3.12.38-nc \
3.12.44-nc \
3.11.10-nc \
3.10.81-nc \
3.10.82-nc \
3.9.11-nc \
3.8.13-nc \
3.7.10-nc \

2
scst/src/dev_handlers/scst_vdisk.c
View File

@@ -2721,7 +2721,7 @@ static int vdisk_get_supported_opcodes(struct scst_cmd *cmd,
*out_supp_opcodes_cnt = ARRAY_SIZE(vdisk_opcode_descriptors);
} else {
*out_supp_opcodes = vdisk_opcode_descriptors_type2;
*out_supp_opcodes_cnt = ARRAY_SIZE(vdisk_opcode_descriptors);
*out_supp_opcodes_cnt = ARRAY_SIZE(vdisk_opcode_descriptors_type2);
}
return 0;
}