diff options
| author | Swen Schillig <swen@vnet.ibm.com> | 2010-01-14 17:19:00 +0100 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@suse.de> | 2010-01-17 19:40:11 +0100 |
| commit | b8f08645f80a0c93246f3539ce53d3cae6a91fa0 (patch) | |
| tree | a54e67374ca084562e62154708ff204ca19d13c7 /drivers | |
| parent | [SCSI] zfcp: add missing compat ptr conversion (diff) | |
| download | linux-b8f08645f80a0c93246f3539ce53d3cae6a91fa0.tar.xz linux-b8f08645f80a0c93246f3539ce53d3cae6a91fa0.zip | |
[SCSI] scsi_transport_fc: Allow LLD to reset FC BSG timeout
The hardware used with zfcp cannot abort a currently pending CT or ELS
request. Therefore we need the option to postpone the timeout
triggered request abort within the fc layer, since there is nothing
zfcp can do to stop the request at this point.
Cc: James Smart <James.Smart@emulex.com>
Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index ddfcecd5099f..653f22a8deb9 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c @@ -3527,7 +3527,10 @@ fc_bsg_job_timeout(struct request *req) if (!done && i->f->bsg_timeout) { /* call LLDD to abort the i/o as it has timed out */ err = i->f->bsg_timeout(job); - if (err) + if (err == -EAGAIN) { + job->ref_cnt--; + return BLK_EH_RESET_TIMER; + } else if (err) printk(KERN_ERR "ERROR: FC BSG request timeout - LLD " "abort failed with status %d\n", err); } |