diff options
| author | Josef Bacik <jbacik@fb.com> | 2017-10-02 16:22:08 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2017-10-02 14:29:09 -0600 |
| commit | 6e60a3bbb45bd8b307269d6a821ee2c72d815846 (patch) | |
| tree | 9bfd658c8774613bd601ea9b5251d2e0eec99d11 /drivers/block/nbd.c | |
| parent | a5f3d8a5eaaf917878f07998e6f1ea46024e6bab (diff) | |
| download | linux-stable-6e60a3bbb45bd8b307269d6a821ee2c72d815846.tar.gz linux-stable-6e60a3bbb45bd8b307269d6a821ee2c72d815846.tar.bz2 linux-stable-6e60a3bbb45bd8b307269d6a821ee2c72d815846.zip | |
nbd: fix -ERESTARTSYS handling
Christoph made it so that if we return'ed BLK_STS_RESOURCE whenever we
got ERESTARTSYS from sending our packets we'd return BLK_STS_OK, which
means we'd never requeue and just hang. We really need to return the
right value from the upper layer.
Fixes: fc17b6534eb8 ("blk-mq: switch ->queue_rq return value to blk_status_t")
Signed-off-by: Josef Bacik <jbacik@fb.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block/nbd.c')
| -rw-r--r-- | drivers/block/nbd.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 3684e21d543f..883dfebd3014 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -820,9 +820,13 @@ static blk_status_t nbd_queue_rq(struct blk_mq_hw_ctx *hctx, * appropriate. */ ret = nbd_handle_cmd(cmd, hctx->queue_num); + if (ret < 0) + ret = BLK_STS_IOERR; + else if (!ret) + ret = BLK_STS_OK; complete(&cmd->send_complete); - return ret < 0 ? BLK_STS_IOERR : BLK_STS_OK; + return ret; } static int nbd_add_socket(struct nbd_device *nbd, unsigned long arg, |