aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390
diff options
context:
space:
mode:
authorChristof Schmitt <christof.schmitt@de.ibm.com>2009-04-17 15:08:11 +0200
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-04-27 10:07:33 -0500
commitc6936e7f34383db2f5038dfa2f0c168ebc2920e5 (patch)
treecbdc7a3ab0707112b6e21b51b25a0f8a8d1c59de /drivers/s390
parent5b43e719308143ac02e6f4ee24132f8acad99ea7 (diff)
downloadkernel_samsung_espresso10-c6936e7f34383db2f5038dfa2f0c168ebc2920e5.zip
kernel_samsung_espresso10-c6936e7f34383db2f5038dfa2f0c168ebc2920e5.tar.gz
kernel_samsung_espresso10-c6936e7f34383db2f5038dfa2f0c168ebc2920e5.tar.bz2
[SCSI] zfcp: Fix abort handler for completions in progress
When the abort handler cannot find a pending FSF request, the request completion could just be running. This means we cannot return SUCCESS, since this would lead to call to scsi_done after exiting the SCSI error handler which is not allowed. Reviewed-by: Martin Petermann <martin@linux.vnet.ibm.com> Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/s390')
-rw-r--r--drivers/s390/scsi/zfcp_scsi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_scsi.c b/drivers/s390/scsi/zfcp_scsi.c
index 5b11386..e7d0652 100644
--- a/drivers/s390/scsi/zfcp_scsi.c
+++ b/drivers/s390/scsi/zfcp_scsi.c
@@ -171,7 +171,7 @@ static int zfcp_scsi_eh_abort_handler(struct scsi_cmnd *scpnt)
write_unlock_irqrestore(&adapter->abort_lock, flags);
zfcp_scsi_dbf_event_abort("lte1", adapter, scpnt, NULL,
old_req_id);
- return SUCCESS;
+ return FAILED; /* completion could be in progress */
}
old_req->data = NULL;