block: remove revalidate_disk()

Remove the now unused helper.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Josef Bacik <josef@toxicpanda.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Acked-by: Song Liu <song@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/md/md.h b/drivers/md/md.h
index d9c4e6b7e9398d368f45b55ce2ef1f661f775152..f9e2ccdd22c4783843d4b95413445d788aa38737 100644 (file)
--- a/drivers/md/md.h
+++ b/drivers/md/md.h
@@ -397,7 +397,7 @@ struct mddev {
         * These locks are separate due to conflicting interactions
         * with bdev->bd_mutex.
         * Lock ordering is:
-        *  reconfig_mutex -> bd_mutex : e.g. do_md_run -> revalidate_disk
+        *  reconfig_mutex -> bd_mutex
         *  bd_mutex -> open_mutex:  e.g. __blkdev_get -> md_open
         */
        struct mutex                    open_mutex;

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 9bfe37f394bde563f3ff551e7634208faf98eaa6..9cb205405f9d99d2e0a52d0bb63ee3b51cfcd6bc 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1339,25 +1339,6 @@ void revalidate_disk_size(struct gendisk *disk, bool verbose)
 }
 EXPORT_SYMBOL(revalidate_disk_size);
 
-/**
- * revalidate_disk - wrapper for lower-level driver's revalidate_disk call-back
- * @disk: struct gendisk to be revalidated
- *
- * This routine is a wrapper for lower-level driver's revalidate_disk
- * call-backs.  It is used to do common pre and post operations needed
- * for all revalidate_disk operations.
- */
-int revalidate_disk(struct gendisk *disk)
-{
-       int ret = 0;
-
-       if (disk->fops->revalidate_disk)
-               ret = disk->fops->revalidate_disk(disk);
-       revalidate_disk_size(disk, ret == 0);
-       return ret;
-}
-EXPORT_SYMBOL(revalidate_disk);
-
 /*
  * This routine checks whether a removable media has been changed,
  * and invalidates all buffer-cache-entries in that case. This

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index 02a73198b289b7c0a39889d02f65b12a91aee3a4..c618b27292fcc8705a8f50da12ae4808b28c5b3c 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -370,7 +370,6 @@ extern void blk_unregister_region(dev_t devt, unsigned long range);
 int register_blkdev(unsigned int major, const char *name);
 void unregister_blkdev(unsigned int major, const char *name);
 
-int revalidate_disk(struct gendisk *disk);
 void revalidate_disk_size(struct gendisk *disk, bool verbose);
 int check_disk_change(struct block_device *bdev);
 int __invalidate_device(struct block_device *bdev, bool kill_dirty);