diff options
author | Mike Christie <michaelc@cs.wisc.edu> | 2009-04-21 16:32:31 -0400 |
---|---|---|
committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-04-27 11:09:51 -0400 |
commit | 9a6510eb3f030cedba32664498a610dc6d084d46 (patch) | |
tree | 694b56e08f2a89000a9e312ce4d6f83a50878263 /drivers/scsi/libiscsi_tcp.c | |
parent | 70932935b61ee3dcc5a419ec4c367feb2ff808e4 (diff) |
[SCSI] iscsi_tcp: don't fire conn error if pdu init fails
If a command's scsi cmd pdu setup fails then we can just fail
the IO to the scsi layer. If a DATA_OUT for a R2T fails then
we will want to drop the session, because it means we got a
bad request from the target (iscsi protocol error).
This patch has us propogate the error upwards so libiscsi_tcp
or libiscsi can decide what the best action is to take. It
also fixes a bug where we could try to grab the session lock
while holding it, because if iscsi_tcp drops the session in the
pdu setup callout the session lock is held when setting up the
scsi cmd pdu.
Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/libiscsi_tcp.c')
-rw-r--r-- | drivers/scsi/libiscsi_tcp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/libiscsi_tcp.c b/drivers/scsi/libiscsi_tcp.c index 91f8ce4d8d08..b579ca9f4836 100644 --- a/drivers/scsi/libiscsi_tcp.c +++ b/drivers/scsi/libiscsi_tcp.c | |||
@@ -1036,8 +1036,11 @@ flush: | |||
1036 | 1036 | ||
1037 | rc = conn->session->tt->init_pdu(task, r2t->data_offset + r2t->sent, | 1037 | rc = conn->session->tt->init_pdu(task, r2t->data_offset + r2t->sent, |
1038 | r2t->data_count); | 1038 | r2t->data_count); |
1039 | if (rc) | 1039 | if (rc) { |
1040 | iscsi_conn_failure(conn, ISCSI_ERR_XMIT_FAILED); | ||
1040 | return rc; | 1041 | return rc; |
1042 | } | ||
1043 | |||
1041 | r2t->sent += r2t->data_count; | 1044 | r2t->sent += r2t->data_count; |
1042 | goto flush; | 1045 | goto flush; |
1043 | } | 1046 | } |