diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-05-29 15:52:34 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-05-29 08:59:21 -0600 |
| commit | 1fc2b62edb228b37c2b4e7e5192becaecd72183f (patch) | |
| tree | 798caff31df164d8b1d2fdf5eec18c3f9168b11c /drivers/scsi/scsi_transport_fc.c | |
| parent | 0df0bb080aca8b3d0f06d9e7d04b07e9ff755ab1 (diff) | |
| download | linux-stable-1fc2b62edb228b37c2b4e7e5192becaecd72183f.tar.gz linux-stable-1fc2b62edb228b37c2b4e7e5192becaecd72183f.tar.bz2 linux-stable-1fc2b62edb228b37c2b4e7e5192becaecd72183f.zip | |
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>
Diffstat (limited to 'drivers/scsi/scsi_transport_fc.c')
| -rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c index 90075a0ddcfe..7a9a65588a1b 100644 --- a/drivers/scsi/scsi_transport_fc.c +++ b/drivers/scsi/scsi_transport_fc.c @@ -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; } /** |