Merge tag 'docs/v5.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[linux-2.6-microblaze.git] / block / genhd.c

diff --git a/block/genhd.c b/block/genhd.c
index 9d060e7..0a27321 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -85,7 +85,7 @@ char *disk_name(struct gendisk *hd, int partno, char *buf)
 
 const char *bdevname(struct block_device *bdev, char *buf)
 {
-       return disk_name(bdev->bd_disk, bdev->bd_part->partno, buf);
+       return disk_name(bdev->bd_disk, bdev->bd_partno, buf);
 }
 EXPORT_SYMBOL(bdevname);
 
@@ -673,11 +673,23 @@ static int exact_lock(dev_t devt, void *data)
        return 0;
 }
 
+static void disk_scan_partitions(struct gendisk *disk)
+{
+       struct block_device *bdev;
+
+       if (!get_capacity(disk) || !disk_part_scan_enabled(disk))
+               return;
+
+       set_bit(GD_NEED_PART_SCAN, &disk->state);
+       bdev = blkdev_get_by_dev(disk_devt(disk), FMODE_READ, NULL);
+       if (!IS_ERR(bdev))
+               blkdev_put(bdev, FMODE_READ);
+}
+
 static void register_disk(struct device *parent, struct gendisk *disk,
                          const struct attribute_group **groups)
 {
        struct device *ddev = disk_to_dev(disk);
-       struct block_device *bdev;
        struct disk_part_iter piter;
        struct hd_struct *part;
        int err;
@@ -719,25 +731,8 @@ static void register_disk(struct device *parent, struct gendisk *disk,
                return;
        }
 
-       /* No minors to use for partitions */
-       if (!disk_part_scan_enabled(disk))
-               goto exit;
-
-       /* No such device (e.g., media were just removed) */
-       if (!get_capacity(disk))
-               goto exit;
-
-       bdev = bdget_disk(disk, 0);
-       if (!bdev)
-               goto exit;
-
-       set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
-       err = blkdev_get(bdev, FMODE_READ, NULL);
-       if (err < 0)
-               goto exit;
-       blkdev_put(bdev, FMODE_READ);
+       disk_scan_partitions(disk);
 
-exit:
        /* announce disk after possible partitions are created */
        dev_set_uevent_suppress(ddev, 0);
        kobject_uevent(&ddev->kobj, KOBJ_ADD);
@@ -1053,7 +1048,7 @@ struct block_device *bdget_disk(struct gendisk *disk, int partno)
 
        part = disk_get_part(disk, partno);
        if (part)
-               bdev = bdget(part_devt(part));
+               bdev = bdget_part(part);
        disk_put_part(part);
 
        return bdev;
@@ -2112,7 +2107,7 @@ bool bdev_check_media_change(struct block_device *bdev)
        if (__invalidate_device(bdev, true))
                pr_warn("VFS: busy inodes on changed media %s\n",
                        bdev->bd_disk->disk_name);
-       set_bit(BDEV_NEED_PART_SCAN, &bdev->bd_flags);
+       set_bit(GD_NEED_PART_SCAN, &bdev->bd_disk->state);
        return true;
 }
 EXPORT_SYMBOL(bdev_check_media_change);