Merge tag 'for-5.11/block-2020-12-14' of git://git.kernel.dk/linux-block

[platform/kernel/linux-starfive.git] / drivers / s390 / block / dasd.c

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index fd56824..6efacad 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -430,7 +430,7 @@ dasd_state_ready_to_online(struct dasd_device * device)
 {
        struct gendisk *disk;
        struct disk_part_iter piter;
-       struct hd_struct *part;
+       struct block_device *part;
 
        device->state = DASD_STATE_ONLINE;
        if (device->block) {
@@ -443,7 +443,7 @@ dasd_state_ready_to_online(struct dasd_device * device)
                disk = device->block->bdev->bd_disk;
                disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0);
                while ((part = disk_part_iter_next(&piter)))
-                       kobject_uevent(&part_to_dev(part)->kobj, KOBJ_CHANGE);
+                       kobject_uevent(bdev_kobj(part), KOBJ_CHANGE);
                disk_part_iter_exit(&piter);
        }
        return 0;
@@ -457,7 +457,7 @@ static int dasd_state_online_to_ready(struct dasd_device *device)
        int rc;
        struct gendisk *disk;
        struct disk_part_iter piter;
-       struct hd_struct *part;
+       struct block_device *part;
 
        if (device->discipline->online_to_ready) {
                rc = device->discipline->online_to_ready(device);
@@ -470,7 +470,7 @@ static int dasd_state_online_to_ready(struct dasd_device *device)
                disk = device->block->bdev->bd_disk;
                disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0);
                while ((part = disk_part_iter_next(&piter)))
-                       kobject_uevent(&part_to_dev(part)->kobj, KOBJ_CHANGE);
+                       kobject_uevent(bdev_kobj(part), KOBJ_CHANGE);
                disk_part_iter_exit(&piter);
        }
        return 0;
@@ -3376,6 +3376,7 @@ dasd_device_operations = {
        .ioctl          = dasd_ioctl,
        .compat_ioctl   = dasd_ioctl,
        .getgeo         = dasd_getgeo,
+       .set_read_only  = dasd_set_read_only,
 };
 
 /*******************************************************************************