block: move rescan_partitions to fs/block_dev.c

Large parts of rescan_partitions aren't about partitions, and
moving it to block_dev.c will allow for some further cleanups by
merging it into its only caller.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/partition-generic.c b/block/partition-generic.c
index 6b9f4f5d993addfab79b9343f86ce3f3a4fe5cd0..2cbc23f6032c0674890fbc77511e9738a303d852 100644 (file)
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
@@ -439,7 +439,7 @@ static bool disk_unlock_native_capacity(struct gendisk *disk)
        }
 }
 
-static int drop_partitions(struct gendisk *disk, struct block_device *bdev)
+int blk_drop_partitions(struct gendisk *disk, struct block_device *bdev)
 {
        struct disk_part_iter piter;
        struct hd_struct *part;
@@ -509,7 +509,7 @@ static bool blk_add_partition(struct gendisk *disk, struct block_device *bdev,
        return true;
 }
 
-static int blk_add_partitions(struct gendisk *disk, struct block_device *bdev)
+int blk_add_partitions(struct gendisk *disk, struct block_device *bdev)
 {
        struct parsed_partitions *state;
        int ret = -EAGAIN, p, highest;
@@ -576,39 +576,6 @@ out_free_state:
        return ret;
 }
 
-int rescan_partitions(struct gendisk *disk, struct block_device *bdev,
-               bool invalidate)
-{
-       int ret;
-
-rescan:
-       ret = drop_partitions(disk, bdev);
-       if (ret)
-               return ret;
-
-       if (invalidate)
-               set_capacity(disk, 0);
-       else if (disk->fops->revalidate_disk)
-               disk->fops->revalidate_disk(disk);
-
-       check_disk_size_change(disk, bdev, !invalidate);
-       bdev->bd_invalidated = 0;
-
-       if (!get_capacity(disk)) {
-               /*
-                * 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;
-}
-
 unsigned char *read_dev_sector(struct block_device *bdev, sector_t n, Sector *p)
 {
        struct address_space *mapping = bdev->bd_inode->i_mapping;

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 0af62b76d03167d24f725566aecdc5f2ac4817f2..ec10dacd18d08b3f6ec864d6cbd6bf9054535ae1 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1416,8 +1416,8 @@ static void flush_disk(struct block_device *bdev, bool kill_dirty)
  * and adjusts it if it differs. When shrinking the bdev size, its all caches
  * are freed.
  */
-void check_disk_size_change(struct gendisk *disk, struct block_device *bdev,
-               bool verbose)
+static void check_disk_size_change(struct gendisk *disk,
+               struct block_device *bdev, bool verbose)
 {
        loff_t disk_size, bdev_size;
 
@@ -1508,6 +1508,40 @@ 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 ret;
+
+rescan:
+       ret = blk_drop_partitions(disk, bdev);
+       if (ret)
+               return ret;
+
+       if (invalidate)
+               set_capacity(disk, 0);
+       else if (disk->fops->revalidate_disk)
+               disk->fops->revalidate_disk(disk);
+
+       check_disk_size_change(disk, bdev, !invalidate);
+       bdev->bd_invalidated = 0;
+
+       if (!get_capacity(disk)) {
+               /*
+                * 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)) {

diff --git a/include/linux/fs.h b/include/linux/fs.h
index e0d909d357634bb26a9adfa65ddbcc9bce5364f6..d233dd661df72a60f32d06ea1446dbdaa6418d35 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2703,8 +2703,6 @@ extern void make_bad_inode(struct inode *);
 extern bool is_bad_inode(struct inode *);
 
 #ifdef CONFIG_BLOCK
-extern void check_disk_size_change(struct gendisk *disk,
-               struct block_device *bdev, bool verbose);
 extern int revalidate_disk(struct gendisk *);
 extern int check_disk_change(struct block_device *);
 extern int __invalidate_device(struct block_device *, bool);

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index fd7774e64f0b291c18f9e7fc1744bfff00a5250a..f5cffbf63abfdb2821ff15673ae757668584bd5a 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -621,9 +621,9 @@ extern void blk_invalidate_devt(dev_t devt);
 extern dev_t blk_lookup_devt(const char *name, int partno);
 extern char *disk_name (struct gendisk *hd, int partno, char *buf);
 
+int blk_add_partitions(struct gendisk *disk, struct block_device *bdev);
+int blk_drop_partitions(struct gendisk *disk, struct block_device *bdev);
 extern int disk_expand_part_tbl(struct gendisk *disk, int target);
-int rescan_partitions(struct gendisk *disk, struct block_device *bdev,
-               bool invalidate);
 extern struct hd_struct * __must_check add_partition(struct gendisk *disk,
                                                     int partno, sector_t start,
                                                     sector_t len, int flags,