block: fix bdev_disk_changed for non-partitioned devices

[linux-block.git] / fs / block_dev.c

diff --git a/fs/block_dev.c b/fs/block_dev.c
index ec10dacd18d08b3f6ec864d6cbd6bf9054535ae1..ae16466a67f7637ae4852fe218145f9b7ee7cf3e 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1508,9 +1508,9 @@ EXPORT_SYMBOL(bd_set_size);
 
 static void __blkdev_put(struct block_device *bdev, fmode_t mode, int for_part);
 
-static int rescan_partitions(struct gendisk *disk, struct block_device *bdev,
-               bool invalidate)
+int bdev_disk_changed(struct block_device *bdev, bool invalidate)
 {
+       struct gendisk *disk = bdev->bd_disk;
        int ret;
 
 rescan:
@@ -1526,32 +1526,21 @@ rescan:
        check_disk_size_change(disk, bdev, !invalidate);
        bdev->bd_invalidated = 0;
 
-       if (!get_capacity(disk)) {
+       if (get_capacity(disk)) {
+               ret = blk_add_partitions(disk, bdev);
+               if (ret == -EAGAIN)
+                       goto rescan;
+       } else {
                /*
                 * Tell userspace that the media / partition table may have
                 * changed.
                 */
                kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE);
-               return 0;
        }
 
-       ret = blk_add_partitions(disk, bdev);
-       if (ret == -EAGAIN)
-               goto rescan;
        return ret;
 }
 
-
-static void bdev_disk_changed(struct block_device *bdev, bool invalidate)
-{
-       if (disk_part_scan_enabled(bdev->bd_disk)) {
-               rescan_partitions(bdev->bd_disk, bdev, invalidate);
-       } else {
-               check_disk_size_change(bdev->bd_disk, bdev, !invalidate);
-               bdev->bd_invalidated = 0;
-       }
-}
-
 /*
  * bd_mutex locking:
  *