scsi_transport_fc: complete requests from ->timeout
By completing the request entirely in the driver we can remove the BLK_EH_HANDLED return value and thus the split responsibility between the driver and the block layer that has been causing trouble. Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Hannes Reinecke <hare@suse.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
parent
0df0bb080a
commit
1fc2b62edb
1 changed files with 3 additions and 4 deletions
|
@ -3591,10 +3591,9 @@ fc_bsg_job_timeout(struct request *req)
|
|||
}
|
||||
|
||||
/* the blk_end_sync_io() doesn't check the error */
|
||||
if (!inflight)
|
||||
return BLK_EH_DONE;
|
||||
else
|
||||
return BLK_EH_HANDLED;
|
||||
if (inflight)
|
||||
blk_mq_complete_request(req);
|
||||
return BLK_EH_DONE;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue