Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1f3ba27 authored by Jan Kara's avatar Jan Kara Committed by Greg Kroah-Hartman
Browse files

bdev: Factor out bdev revalidation into a common helper 



commit 731dc4868311ee097757b8746eaa1b4f8b2b4f1c upstream.

Factor out code handling revalidation of bdev on disk change into a
common helper.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Cc: Laura Abbott <labbott@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fbf86f6d

fs/block_dev.c

+14 −12
Original line number Diff line number Diff line
@@ -1512,6 +1512,14 @@ EXPORT_SYMBOL(bd_set_size); 


static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part);



static void bdev_disk_changed(struct block_device *bdev, bool invalidate)

{

	if (invalidate)

		invalidate_partitions(bdev->bd_disk, bdev);

	else

		rescan_partitions(bdev->bd_disk, bdev);

}



/*

 * bd_mutex locking:

 *
@@ -1594,12 +1602,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) 
			 * The latter is necessary to prevent ghost

			 * partitions on a removed medium.

			 */

			if (bdev->bd_invalidated) {

				if (!ret)

					rescan_partitions(disk, bdev);

				else if (ret == -ENOMEDIUM)

					invalidate_partitions(disk, bdev);

			}

			if (bdev->bd_invalidated &&

			    (!ret || ret == -ENOMEDIUM))

				bdev_disk_changed(bdev, ret == -ENOMEDIUM);



			if (ret)

				goto out_clear;
@@ -1632,12 +1637,9 @@ static int __blkdev_get(struct block_device *bdev, fmode_t mode, int for_part) 
			if (bdev->bd_disk->fops->open)

				ret = bdev->bd_disk->fops->open(bdev, mode);

			/* the same as first opener case, read comment there */

			if (bdev->bd_invalidated) {

				if (!ret)

					rescan_partitions(bdev->bd_disk, bdev);

				else if (ret == -ENOMEDIUM)

					invalidate_partitions(bdev->bd_disk, bdev);

			}

			if (bdev->bd_invalidated &&

			    (!ret || ret == -ENOMEDIUM))

				bdev_disk_changed(bdev, ret == -ENOMEDIUM);

			if (ret)

				goto out_unlock_bdev;

		}