diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-03-13 21:20:11 -0400 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2012-03-14 00:43:58 -0400 |
commit | 00fdc6bbef77844ce397a7de7acfaf25e8e2e4eb (patch) | |
tree | df8d71a6b9c9239b68d43fc04d57580caf3e4992 /drivers | |
parent | 087a03b3ea1c8d6e2d5743a8d1c6d571058caa04 (diff) |
iscsi-target: Fix reservation conflict -EBUSY response handling bug
This patch addresses a iscsi-target specific bug related to reservation conflict
handling in iscsit_handle_scsi_cmd() that has been causing reservation conflicts
to complete and not fail as expected due to incorrect errno checking. The problem
occured with the change to return -EBUSY from transport_generic_cmd_sequencer() ->
transport_generic_allocate_tasks() failures, that broke iscsit_handle_scsi_cmd()
checking for -EINVAL in order to invoke a non GOOD status response.
This was manifesting itself as data corruption with legacy SPC-2 reservations,
but also effects iscsi-target LUNs with SPC-3 persistent reservations.
This bug was originally introduced in lio-core commit:
commit 03e98c9eb916f3f0868c1dc344dde2a60287ff72
Author: Nicholas Bellinger <nab@linux-iscsi.org>
Date: Fri Nov 4 02:36:16 2011 -0700
target: Address legacy PYX_TRANSPORT_* return code breakage
Reported-by: Martin Svec <martin.svec@zoner.cz>
Cc: Martin Svec <martin.svec@zoner.cz>
Cc: Christoph Hellwig <hch@lst.de>
Cc: stable@vger.kernel.org
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/target/iscsi/iscsi_target.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/iscsi/iscsi_target.c b/drivers/target/iscsi/iscsi_target.c index 44262908def5..501b27c18145 100644 --- a/drivers/target/iscsi/iscsi_target.c +++ b/drivers/target/iscsi/iscsi_target.c | |||
@@ -1028,7 +1028,7 @@ done: | |||
1028 | return iscsit_add_reject_from_cmd( | 1028 | return iscsit_add_reject_from_cmd( |
1029 | ISCSI_REASON_BOOKMARK_NO_RESOURCES, | 1029 | ISCSI_REASON_BOOKMARK_NO_RESOURCES, |
1030 | 1, 1, buf, cmd); | 1030 | 1, 1, buf, cmd); |
1031 | } else if (transport_ret == -EINVAL) { | 1031 | } else if (transport_ret < 0) { |
1032 | /* | 1032 | /* |
1033 | * Unsupported SAM Opcode. CHECK_CONDITION will be sent | 1033 | * Unsupported SAM Opcode. CHECK_CONDITION will be sent |
1034 | * in iscsit_execute_cmd() during the CmdSN OOO Execution | 1034 | * in iscsit_execute_cmd() during the CmdSN OOO Execution |