diff options
| author | Giridhar Malavali <giridhar.malavali@qlogic.com> | 2009-06-20 01:26:54 +0200 |
|---|---|---|
| committer | James Bottomley <James.Bottomley@HansenPartnership.com> | 2009-06-21 18:13:41 +0200 |
| commit | 47e7e89ed029780adf2cc0cf506fcd4c2d5ca1e2 (patch) | |
| tree | 7b3c8d852693c2ac586ffce8a8daf74b644a5bd1 | |
| parent | fc_transport: The softirq_done function registration for BSG request (diff) | |
| download | linux-47e7e89ed029780adf2cc0cf506fcd4c2d5ca1e2.tar.xz linux-47e7e89ed029780adf2cc0cf506fcd4c2d5ca1e2.zip | |
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>
| -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 453d9e658eb6..140c50c8a5d2 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 |