summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Reed <mdr@sgi.com>2008-10-24 15:13:47 -0700
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-11-05 12:42:12 -0500
commit5bff55db3dc4d659f46b4d2fce2f61c1964c2762 (patch)
treedacb58c042b09406345cfa0cb3f67dae500aa2cc
parent680d7db88ace53c673e1c437c9b6abcc053e8d6f (diff)
downloadkernel-crypto-5bff55db3dc4d659f46b4d2fce2f61c1964c2762.tar.gz
kernel-crypto-5bff55db3dc4d659f46b4d2fce2f61c1964c2762.tar.xz
kernel-crypto-5bff55db3dc4d659f46b4d2fce2f61c1964c2762.zip
[SCSI] qla2xxx: Return a FAILED status when abort mailbox-command fails.
Mike Reed noted (https://bugzilla.novell.com/show_bug.cgi?id=421330) that the driver was incorrectly returning a SUCCESS status if the driver's request to the firmware to abort a command failed. By doing so, the mid-layer believed, incorrectly, that the command has completed and has been returned (ultimately clearing scsi_cmnd.request_buffer) yet the driver still has the command. What should correctly happen is a mid-layer escalation (device-reset, etc.) of recovery during which the driver will eventually return the outstanding commands to the mid-layer. Cc: Stable Tree <stable@kernel.org> Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
-rw-r--r--drivers/scsi/qla2xxx/qla_os.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c
index 21dd182ad51..35567203ef6 100644
--- a/drivers/scsi/qla2xxx/qla_os.c
+++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -728,6 +728,7 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)
if (ha->isp_ops->abort_command(ha, sp)) {
DEBUG2(printk("%s(%ld): abort_command "
"mbx failed.\n", __func__, ha->host_no));
+ ret = FAILED;
} else {
DEBUG3(printk("%s(%ld): abort_command "
"mbx success.\n", __func__, ha->host_no));