diff options
| author | Yu Kuai | 2021-09-16 17:33:47 +0800 |
|---|---|---|
| committer | Jens Axboe | 2021-10-18 14:50:37 -0600 |
| commit | 0de2b7a4dd08eeb82b8cc3fe5d6b8ba49a32f7bd (patch) | |
| tree | f692a661f4d12c93fac13a3cc9ea02b977efd53b /drivers/block | |
| parent | fcf3d633d8e101e84a0e072ab79957b938ac7e06 (diff) | |
nbd: don't start request if nbd_queue_rq() failed
commit 6a468d5990ec ("nbd: don't start req until after the dead
connection logic") move blk_mq_start_request() from nbd_queue_rq()
to nbd_handle_cmd() to skip starting request if the connection is
dead. However, request is still started in other error paths.
Currently, blk_mq_end_request() will be called immediately if
nbd_queue_rq() failed, thus start request in such situation is
useless. So remove blk_mq_start_request() from error paths in
nbd_handle_cmd().
Signed-off-by: Yu Kuai <yukuai3@huawei.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Link: https://lore.kernel.org/r/20210916093350.1410403-5-yukuai3@huawei.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/nbd.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 49c501cf8a8b..87066cad5711 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -939,7 +939,6 @@ static int nbd_handle_cmd(struct nbd_cmd *cmd, int index) if (!refcount_inc_not_zero(&nbd->config_refs)) { dev_err_ratelimited(disk_to_dev(nbd->disk), "Socks array is empty\n"); - blk_mq_start_request(req); return -EINVAL; } config = nbd->config; @@ -948,7 +947,6 @@ static int nbd_handle_cmd(struct nbd_cmd *cmd, int index) dev_err_ratelimited(disk_to_dev(nbd->disk), "Attempted send on invalid socket\n"); nbd_config_put(nbd); - blk_mq_start_request(req); return -EINVAL; } cmd->status = BLK_STS_OK; @@ -972,7 +970,6 @@ again: */ sock_shutdown(nbd); nbd_config_put(nbd); - blk_mq_start_request(req); return -EIO; } goto again; |