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' (r6189)

Browse Source 
Conflicts:
	iscsi-scst/kernel/nthread.c
	qla2x00t/qla_iocb.c
	scst/src/scst_lib.c
	www/target_emulex.html
This commit is contained in:
Bart Van Assche
2015-05-01 08:07:22 +02:00
parent 48b8f91547 0b4fe40d3e
commit b493c5b8f6
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1568,7 +1568,7 @@ static int cmnd_prepare_recv_pdu(struct iscsi_conn *conn,
EXTRACHECKS_BUG_ON(addr == NULL);
sg_len = sg[idx].offset + sg[idx].length - offset;
conn->read_iov[i].iov_base = (void __force __user *)addr + offset;
conn->read_iov[i].iov_base = addr + offset;
if (size <= sg_len) {
TRACE_DBG("idx=%d, i=%d, offset=%u, size=%d, addr=%p",

5
scst/src/scst_lib.c
View File

@@ -5279,6 +5279,8 @@ static void scst_ws_process_tail(struct scst_write_same_priv *wsp)
unsigned left;
int i;
TRACE_ENTRY();
lockdep_assert_held(&wsp->ws_mutex);
EXTRACHECKS_BUG_ON(wsp->ws_cur_in_flight > 0);
EXTRACHECKS_BUG_ON(wsp->ws_left_to_send >= wsp->ws_max_each);
@@ -5306,6 +5308,9 @@ static void scst_ws_process_tail(struct scst_write_same_priv *wsp)
}
left -= len;
}
TRACE_EXIT();
return;
}
/* Must be called in a thread context and no locks */