diff options
| author | Christoph Hellwig <hch@lst.de> | 2018-05-29 15:52:31 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2018-05-29 08:59:21 -0600 |
| commit | e5eab0170410184fa8c2f1ce61df36969b59b5eb (patch) | |
| tree | 28aaa840b2fd391d234b9930ae67fe85e6543dc7 /drivers/block/nbd.c | |
| parent | db8c48e4b2fa7c7ad1e429fe980e787698033ee9 (diff) | |
| download | talos-obmc-linux-e5eab0170410184fa8c2f1ce61df36969b59b5eb.tar.gz talos-obmc-linux-e5eab0170410184fa8c2f1ce61df36969b59b5eb.zip | |
nbd: 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>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/nbd.c')
| -rw-r--r-- | drivers/block/nbd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 88ae833aabe9..8860b24098bc 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -304,7 +304,7 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, if (!refcount_inc_not_zero(&nbd->config_refs)) { cmd->status = BLK_STS_TIMEOUT; - return BLK_EH_HANDLED; + goto done; } config = nbd->config; @@ -342,8 +342,9 @@ static enum blk_eh_timer_return nbd_xmit_timeout(struct request *req, cmd->status = BLK_STS_IOERR; sock_shutdown(nbd); nbd_config_put(nbd); - - return BLK_EH_HANDLED; +done: + blk_mq_complete_request(req); + return BLK_EH_DONE; } /* |
