Merge tag 'pull-bd_inode-1' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux.git] / block / partitions / core.c

diff --git a/block/partitions/core.c b/block/partitions/core.c
index 37b5f92d07fec96d6b13e53b4194edbe938e4fcd..84023b82e5a1e5dac5d2f66438e7c3324069d3f3 100644 (file)
--- a/block/partitions/core.c
+++ b/block/partitions/core.c
@@ -243,7 +243,7 @@ static const struct attribute_group *part_attr_groups[] = {
 static void part_release(struct device *dev)
 {
        put_disk(dev_to_bdev(dev)->bd_disk);
-       iput(dev_to_bdev(dev)->bd_inode);
+       bdev_drop(dev_to_bdev(dev));
 }
 
 static int part_uevent(const struct device *dev, struct kobj_uevent_env *env)
@@ -469,7 +469,7 @@ int bdev_del_partition(struct gendisk *disk, int partno)
         * Just delete the partition and invalidate it.
         */
 
-       remove_inode_hash(part->bd_inode);
+       bdev_unhash(part);
        invalidate_bdev(part);
        drop_partition(part);
        ret = 0;
@@ -652,7 +652,7 @@ rescan:
                 * it cannot be looked up any more even when openers
                 * still hold references.
                 */
-               remove_inode_hash(part->bd_inode);
+               bdev_unhash(part);
 
                /*
                 * If @disk->open_partitions isn't elevated but there's
@@ -701,7 +701,7 @@ EXPORT_SYMBOL_GPL(bdev_disk_changed);
 
 void *read_part_sector(struct parsed_partitions *state, sector_t n, Sector *p)
 {
-       struct address_space *mapping = state->disk->part0->bd_inode->i_mapping;
+       struct address_space *mapping = state->disk->part0->bd_mapping;
        struct folio *folio;
 
        if (n >= get_capacity(state->disk)) {