[patch 1/3] scsi_transport_fc: Allow LLD to reset FC BSG timeout

[Christof Schmitt <christof.schmitt@de.ibm.com>]

[-- Attachment #1: bsg_job_timeout.patch --]
[-- Type: text/plain, Size: 1095 bytes --]

From: Swen Schillig <swen@vnet.ibm.com>

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>
---
 drivers/scsi/scsi_transport_fc.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

--- a/drivers/scsi/scsi_transport_fc.c	2010-01-14 16:44:42.000000000 +0100
+++ b/drivers/scsi/scsi_transport_fc.c	2010-01-14 16:44:43.000000000 +0100
@@ -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);
 	}