From: Giridhar Malavali <giridhar.malavali@qlogic.com>
Date: Fri, 19 Jun 2009 23:26:54 +0000 (-0700)
Subject: fc_transport: Selective return value from BSG timeout function
X-Git-Tag: v2.6.31-rc1~32^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47e7e89ed029780adf2cc0cf506fcd4c2d5ca1e2;p=platform%2Fkernel%2Flinux-exynos.git

fc_transport: Selective return value from BSG timeout function

The return value from BSG timout function should be based on the state of the
BSG job. This helps block layer to take selective actions to clean up BSG job.

Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com>
Acked-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
---

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 453d9e6..140c50c 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -3480,7 +3480,10 @@ fc_bsg_job_timeout(struct request *req)
 	}
 
 	/* the blk_end_sync_io() doesn't check the error */
-	return BLK_EH_HANDLED;
+	if (done)
+		return BLK_EH_NOT_HANDLED;
+	else
+		return BLK_EH_HANDLED;
 }
 
 static int