Merge "block: Fix bdi assignment to bdev inode when racing with disk delete" (5954c329) · Commits · e / devices / android_kernel_sony_msm8998

fs/block_dev.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -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;