block: fold bdev_unhash_inode into invalidate_partition

invalidate_partition and bdev_unhash_inode are always paired, and
invalidate_partition already does an icache lookup for the block device
inode.  Piggy back on that to remove the inode from the hash.

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/genhd.c b/block/genhd.c
index 980a4609d4a545aa05861f501dfe78bfa08474b4..c05d509877fa7886031d21050fbff4009c55b931 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -888,6 +888,12 @@ static void invalidate_partition(struct gendisk *disk, int partno)
 
        fsync_bdev(bdev);
        __invalidate_device(bdev, true);
+
+       /*
+        * Unhash the bdev inode for this device so that it gets evicted as soon
+        * as last inode reference is dropped.
+        */
+       remove_inode_hash(bdev->bd_inode);
        bdput(bdev);
 }
 
@@ -909,13 +915,11 @@ void del_gendisk(struct gendisk *disk)
                             DISK_PITER_INCL_EMPTY | DISK_PITER_REVERSE);
        while ((part = disk_part_iter_next(&piter))) {
                invalidate_partition(disk, part->partno);
-               bdev_unhash_inode(part_devt(part));
                delete_partition(disk, part);
        }
        disk_part_iter_exit(&piter);
 
        invalidate_partition(disk, 0);
-       bdev_unhash_inode(disk_devt(disk));
        set_capacity(disk, 0);
        disk->flags &= ~GENHD_FL_UP;
        up_write(&disk->lookup_sem);

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 9c8de54fa0c98b02b2adbecb2df53d58043d8d0b..998820174d3edf34d256c6ccd4dabd84b8e55c46 100644 (file)
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -883,21 +883,6 @@ static int bdev_set(struct inode *inode, void *data)
 
 static LIST_HEAD(all_bdevs);
 
-/*
- * If there is a bdev inode for this device, unhash it so that it gets evicted
- * as soon as last inode reference is dropped.
- */
-void bdev_unhash_inode(dev_t dev)
-{
-       struct inode *inode;
-
-       inode = ilookup5(blockdev_superblock, hash(dev), bdev_test, &dev);
-       if (inode) {
-               remove_inode_hash(inode);
-               iput(inode);
-       }
-}
-
 struct block_device *bdget(dev_t dev)
 {
        struct block_device *bdev;

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 2b4e9f86b151602d6355200f4ccfd6c06085194f..1a95e5158811334332f6c25499c40d727ebb507e 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2581,7 +2581,6 @@ extern struct kmem_cache *names_cachep;
 #ifdef CONFIG_BLOCK
 extern int register_blkdev(unsigned int, const char *);
 extern void unregister_blkdev(unsigned int, const char *);
-extern void bdev_unhash_inode(dev_t dev);
 extern struct block_device *bdget(dev_t);
 extern struct block_device *bdgrab(struct block_device *bdev);
 extern void bd_set_size(struct block_device *, loff_t size);