block: add a disk_uevent helper

Add a helper to call kobject_uevent for the disk and all partitions, and
unexport the disk_part_iter_* helpers that are now only used in the core
block code.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/genhd.c b/block/genhd.c
index e46de616a19e59461e63699be5e8b076779ea31d..7094612c7510a849ab02ebdb6ebe9e6c6ae48e0a 100644 (file)
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -203,7 +203,6 @@ void disk_part_iter_init(struct disk_part_iter *piter, struct gendisk *disk,
 
        rcu_read_unlock();
 }
-EXPORT_SYMBOL_GPL(disk_part_iter_init);
 
 /**
  * disk_part_iter_next - proceed iterator to the next partition and return it
@@ -266,7 +265,6 @@ struct block_device *disk_part_iter_next(struct disk_part_iter *piter)
 
        return piter->part;
 }
-EXPORT_SYMBOL_GPL(disk_part_iter_next);
 
 /**
  * disk_part_iter_exit - finish up partition iteration
@@ -283,7 +281,6 @@ void disk_part_iter_exit(struct disk_part_iter *piter)
                bdput(piter->part);
        piter->part = NULL;
 }
-EXPORT_SYMBOL_GPL(disk_part_iter_exit);
 
 /**
  * disk_has_partitions
@@ -555,6 +552,18 @@ static char *bdevt_str(dev_t devt, char *buf)
        return buf;
 }
 
+void disk_uevent(struct gendisk *disk, enum kobject_action action)
+{
+       struct disk_part_iter piter;
+       struct block_device *part;
+
+       disk_part_iter_init(&piter, disk, DISK_PITER_INCL_PART0);
+       while ((part = disk_part_iter_next(&piter)))
+               kobject_uevent(bdev_kobj(part), action);
+       disk_part_iter_exit(&piter);
+}
+EXPORT_SYMBOL_GPL(disk_uevent);
+
 static void disk_scan_partitions(struct gendisk *disk)
 {
        struct block_device *bdev;
@@ -572,8 +581,6 @@ static void register_disk(struct device *parent, struct gendisk *disk,
                          const struct attribute_group **groups)
 {
        struct device *ddev = disk_to_dev(disk);
-       struct disk_part_iter piter;
-       struct block_device *part;
        int err;
 
        ddev->parent = parent;
@@ -616,15 +623,9 @@ static void register_disk(struct device *parent, struct gendisk *disk,
 
        disk_scan_partitions(disk);
 
-       /* announce disk after possible partitions are created */
+       /* announce the disk and partitions after all partitions are created */
        dev_set_uevent_suppress(ddev, 0);
-       kobject_uevent(&ddev->kobj, KOBJ_ADD);
-
-       /* announce possible partitions */
-       disk_part_iter_init(&piter, disk, 0);
-       while ((part = disk_part_iter_next(&piter)))
-               kobject_uevent(bdev_kobj(part), KOBJ_ADD);
-       disk_part_iter_exit(&piter);
+       disk_uevent(disk, KOBJ_ADD);
 
        if (disk->queue->backing_dev_info->dev) {
                err = sysfs_create_link(&ddev->kobj,

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index c7eb9a10c680d2ba4782d5372c7fe577975d0ff3..28c04a4efa66f2706568134459336619c877bc2b 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -428,23 +428,15 @@ static int dasd_state_unfmt_to_basic(struct dasd_device *device)
 static int
 dasd_state_ready_to_online(struct dasd_device * device)
 {
-       struct gendisk *disk;
-       struct disk_part_iter piter;
-       struct block_device *part;
-
        device->state = DASD_STATE_ONLINE;
        if (device->block) {
                dasd_schedule_block_bh(device->block);
                if ((device->features & DASD_FEATURE_USERAW)) {
-                       disk = device->block->gdp;
-                       kobject_uevent(&disk_to_dev(disk)->kobj, KOBJ_CHANGE);
+                       kobject_uevent(&disk_to_dev(device->block->gdp)->kobj,
+                                       KOBJ_CHANGE);
                        return 0;
                }
-               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(bdev_kobj(part), KOBJ_CHANGE);
-               disk_part_iter_exit(&piter);
+               disk_uevent(device->block->bdev->bd_disk, KOBJ_CHANGE);
        }
        return 0;
 }
@@ -455,9 +447,6 @@ dasd_state_ready_to_online(struct dasd_device * device)
 static int dasd_state_online_to_ready(struct dasd_device *device)
 {
        int rc;
-       struct gendisk *disk;
-       struct disk_part_iter piter;
-       struct block_device *part;
 
        if (device->discipline->online_to_ready) {
                rc = device->discipline->online_to_ready(device);
@@ -466,13 +455,8 @@ static int dasd_state_online_to_ready(struct dasd_device *device)
        }
 
        device->state = DASD_STATE_READY;
-       if (device->block && !(device->features & DASD_FEATURE_USERAW)) {
-               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(bdev_kobj(part), KOBJ_CHANGE);
-               disk_part_iter_exit(&piter);
-       }
+       if (device->block && !(device->features & DASD_FEATURE_USERAW))
+               disk_uevent(device->block->bdev->bd_disk, KOBJ_CHANGE);
        return 0;
 }
 

diff --git a/include/linux/genhd.h b/include/linux/genhd.h
index a62ccbfac54b483af396c3a2d9b3ccace271d48c..670eaef0e87622b905c3085ad4030d90d00494f5 100644 (file)
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
@@ -213,6 +213,8 @@ static inline dev_t disk_devt(struct gendisk *disk)
        return MKDEV(disk->major, disk->first_minor);
 }
 
+void disk_uevent(struct gendisk *disk, enum kobject_action action);
+
 /*
  * Smarter partition iterator without context limits.
  */