Skip to content

Commit 87aac3a

Browse files
lxbszaxboe
authored andcommitted
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>
1 parent d8f53b0 commit 87aac3a

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/block/nbd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -802,9 +802,9 @@ static void recv_work(struct work_struct *work)
802802
if (likely(!blk_should_fake_timeout(rq->q)))
803803
blk_mq_complete_request(rq);
804804
}
805+
nbd_config_put(nbd);
805806
atomic_dec(&config->recv_threads);
806807
wake_up(&config->recv_wq);
807-
nbd_config_put(nbd);
808808
kfree(args);
809809
}
810810

0 commit comments

Comments
 (0)