Merge branch 'idr-4.11' of git://git.infradead.org/users/willy/linux-dax

[mirror_ubuntu-artful-kernel.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 3631cd4802955247d27316c10b172744700e6340..2f444b87a5f244db1bd65fea29eea1daae265c1a 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -669,14 +669,14 @@ void del_gendisk(struct gendisk *disk)
        disk_part_iter_init(&piter, disk,
                             DISK_PITER_INCL_EMPTY | DISK_PITER_REVERSE);
        while ((part = disk_part_iter_next(&piter))) {
-               bdev_unhash_inode(MKDEV(disk->major,
-                                       disk->first_minor + part->partno));
                invalidate_partition(disk, part->partno);
+               bdev_unhash_inode(part_devt(part));
                delete_partition(disk, part->partno);
        }
        disk_part_iter_exit(&piter);
 
        invalidate_partition(disk, 0);
+       bdev_unhash_inode(disk_devt(disk));
        set_capacity(disk, 0);
        disk->flags &= ~GENHD_FL_UP;