diff options
| author | Jan Kara <jack@suse.cz> | 2017-03-23 01:36:53 +0100 |
|---|---|---|
| committer | Ritesh Harjani <riteshh@codeaurora.org> | 2017-10-18 12:06:01 +0530 |
| commit | f4f6d3c0b02ede4283553dd2bdaa335204aed5f7 (patch) | |
| tree | 5759ebd8dfff26a311d2201e1879bbebd48063a6 | |
| parent | 16d289189c40a69737bbb59ea6520ab4dec205da (diff) | |
block: Fix bdi assignment to bdev inode when racing with disk delete
When disk->fops->open() in __blkdev_get() returns -ERESTARTSYS, we
restart the process of opening the block device. However we forget to
switch bdev->bd_bdi back to noop_backing_dev_info and as a result bdev
inode will be pointing to a stale bdi. Fix the problem by setting
bdev->bd_bdi later when __blkdev_get() is already guaranteed to succeed.
Acked-by: Tejun Heo <tj@kernel.org>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@fb.com>
Change-Id: I6736ed1aba8732d3146284311c718f48b9c06578
Git-repo:
git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git
Git-commit: 03e262798884b0a5f948b17433afd80606cb3497
Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org>
| -rw-r--r-- | fs/block_dev.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index d3c296d4eb25..41f112beeefc 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1221,8 +1221,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) bdev->bd_disk = disk; bdev->bd_queue = disk->queue; bdev->bd_contains = bdev; - if (bdev->bd_bdi == &noop_backing_dev_info) - bdev->bd_bdi = bdi_get(disk->queue->backing_dev_info); bdev->bd_inode->i_flags = disk->fops->direct_access ? S_DAX : 0; if (!partno) { @@ -1294,6 +1292,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) (bdev->bd_part->nr_sects % (PAGE_SIZE / 512))) bdev->bd_inode->i_flags &= ~S_DAX; } + + if (bdev->bd_bdi == &noop_backing_dev_info) + bdev->bd_bdi = bdi_get(disk->queue->backing_dev_info); } else { if (bdev->bd_contains == bdev) { ret = 0; @@ -1325,8 +1326,6 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) bdev->bd_disk = NULL; bdev->bd_part = NULL; bdev->bd_queue = NULL; - bdi_put(bdev->bd_bdi); - bdev->bd_bdi = &noop_backing_dev_info; if (bdev != bdev->bd_contains) __blkdev_put(bdev->bd_contains, mode, 1); bdev->bd_contains = NULL; |