diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-05-29 15:52:32 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-05-29 16:59:21 +0200 |
| commit | c5fb85b7ff7648a8b51af2062b9242a83d513b68 (patch) | |
| tree | 1fcc866b6eb60bf714ef7bb94e9ab3409a578c93 /drivers/block/mtip32xx/mtip32xx.c | |
| parent | nbd: complete requests from ->timeout (diff) | |
| download | linux-c5fb85b7ff7648a8b51af2062b9242a83d513b68.tar.xz linux-c5fb85b7ff7648a8b51af2062b9242a83d513b68.zip | |
mtip32xx: 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/block/mtip32xx/mtip32xx.c')
| -rw-r--r-- | drivers/block/mtip32xx/mtip32xx.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c index e873daca9d13..95657b814543 100644 --- a/drivers/block/mtip32xx/mtip32xx.c +++ b/drivers/block/mtip32xx/mtip32xx.c @@ -3719,7 +3719,8 @@ static enum blk_eh_timer_return mtip_cmd_timeout(struct request *req, struct mtip_cmd *cmd = blk_mq_rq_to_pdu(req); cmd->status = BLK_STS_TIMEOUT; - return BLK_EH_HANDLED; + blk_mq_complete_request(req); + return BLK_EH_DONE; } if (test_bit(req->tag, dd->port->cmds_to_issue)) |