bdev: Factor out bdev revalidation into a common helper

BugLink: https://bugs.launchpad.net/bugs/1860602
commit 731dc4868311ee097757b8746eaa1b4f8b2b4f1c upstream.

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

Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 6f533fb36e03f1697eb09a363d9ae76c742d522b..2433dd4db98a861c135bef69226be4c420f2bec0 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1403,6 +1403,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:
  *
@@ -1486,12 +1494,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;
@@ -1524,12 +1529,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;
                }