diff options
| author |   Jan Kara <jack@suse.cz> | 2019-08-07 11:36:47 +0200 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2019-08-08 07:37:03 -0600 |
| commit | e91455bad5cff40a8c232f2204a5104127e3fec2 (patch) | |
| tree | bb50daf2d6637e3d9e5dbab4fc613075a19af297 /fs/block_dev.c | |
| parent | block, bfq: handle NULL return value by bfq_init_rq() (diff) | |
| download | wireguard-linux-e91455bad5cff40a8c232f2204a5104127e3fec2.tar.xz wireguard-linux-e91455bad5cff40a8c232f2204a5104127e3fec2.zip | |
bdev: Fixup error handling in blkdev_get()
Commit 89e524c04fa9 ("loop: Fix mount(2) failure due to race with
LOOP_SET_FD") converted blkdev_get() to use the new helpers for
finishing claiming of a block device. However the conversion botched the
error handling in blkdev_get() and thus the bdev has been marked as held
even in case __blkdev_get() returned error. This led to occasional
warnings with block/001 test from blktests like:
kernel: WARNING: CPU: 5 PID: 907 at fs/block_dev.c:1899 __blkdev_put+0x396/0x3a0
Correct the error handling.
CC: stable@vger.kernel.org
Fixes: 89e524c04fa9 ("loop: Fix mount(2) failure due to race with LOOP_SET_FD")
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index 131e2e0582a6..eb657ab94060 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1750,7 +1750,10 @@ int blkdev_get(struct block_device *bdev, fmode_t mode, void *holder) /* finish claiming */ mutex_lock(&bdev->bd_mutex); - bd_finish_claiming(bdev, whole, holder); + if (!res) + bd_finish_claiming(bdev, whole, holder); + else + bd_abort_claiming(bdev, whole, holder); /* * Block event polling for write claims if requested. Any * write holder makes the write_holder state stick until |