diff options
author | Xiubo Li <xiubli@redhat.com> | 2020-10-13 22:45:14 -0400 |
---|---|---|
committer | Jens Axboe <axboe@kernel.dk> | 2020-10-14 12:30:37 -0600 |
commit | 87aac3a80af5cbad93e63250e8a1e19095ba0d30 (patch) | |
tree | 609f0e7c0b09ecb0b0912127aef79f3ff784aa68 | |
parent | d8f53b0ab0337762cc9e7b50d0c60b5bd091a0e1 (diff) |
nbd: make the config put is called before the notifying the waiter
There has one race case for ceph's rbd-nbd tool. When do mapping
it may fail with EBUSY from ioctl(nbd, NBD_DO_IT), but actually
the nbd device has already unmaped.
It dues to if just after the wake_up(), the recv_work() is scheduled
out and defers calling the nbd_config_put(), though the map process
has exited the "nbd->recv_task" is not cleared.
Signed-off-by: Xiubo Li <xiubli@redhat.com>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r-- | drivers/block/nbd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 2dca0aab0a9a..90c2effb5ded 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c @@ -802,9 +802,9 @@ static void recv_work(struct work_struct *work) if (likely(!blk_should_fake_timeout(rq->q))) blk_mq_complete_request(rq); } + nbd_config_put(nbd); atomic_dec(&config->recv_threads); wake_up(&config->recv_wq); - nbd_config_put(nbd); kfree(args); } |