block: remove the disk argument from blk_drop_partitions

The gendisk can be trivially deducted from the block_device.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/partitions/core.c b/block/partitions/core.c
index 7d062599aa33559ad7696c989a3cc832bd5ccb63..deccc3fbcd375dacf6626d67222e7bbfd515225d 100644 (file)
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -603,23 +603,23 @@ static bool disk_unlock_native_capacity(struct gendisk *disk)
        }
 }
 
-int blk_drop_partitions(struct gendisk *disk, struct block_device *bdev)
+int blk_drop_partitions(struct block_device *bdev)
 {
        struct disk_part_iter piter;
        struct hd_struct *part;
        int res;
 
-       if (!disk_part_scan_enabled(disk))
+       if (!disk_part_scan_enabled(bdev->bd_disk))
                return 0;
        if (bdev->bd_part_count || bdev->bd_openers > 1)
                return -EBUSY;
-       res = invalidate_partition(disk, 0);
+       res = invalidate_partition(bdev->bd_disk, 0);
        if (res)
                return res;
 
-       disk_part_iter_init(&piter, disk, DISK_PITER_INCL_EMPTY);
+       disk_part_iter_init(&piter, bdev->bd_disk, DISK_PITER_INCL_EMPTY);
        while ((part = disk_part_iter_next(&piter)))
-               delete_partition(disk, part);
+               delete_partition(bdev->bd_disk, part);
        disk_part_iter_exit(&piter);
 
        return 0;

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 52b6f646cdbd0af27d827d9e4d983ec1455c87f0..9c8de54fa0c98b02b2adbecb2df53d58043d8d0b 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1517,7 +1517,7 @@ int bdev_disk_changed(struct block_device *bdev, bool invalidate)
        lockdep_assert_held(&bdev->bd_mutex);
 
 rescan:
-       ret = blk_drop_partitions(disk, bdev);
+       ret = blk_drop_partitions(bdev);
        if (ret)
                return ret;
 

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 9b3fffdf40116b086360c978d8c19eedc82095db..058d895544c75ae63c5f6fb17ff1bd1ebd006e29 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -339,7 +339,7 @@ extern dev_t blk_lookup_devt(const char *name, int partno);
 
 int bdev_disk_changed(struct block_device *bdev, bool invalidate);
 int blk_add_partitions(struct gendisk *disk, struct block_device *bdev);
-int blk_drop_partitions(struct gendisk *disk, struct block_device *bdev);
+int blk_drop_partitions(struct block_device *bdev);
 extern void printk_all_partitions(void);
 
 extern struct gendisk *__alloc_disk_node(int minors, int node_id);