Commit b41148c0 authored by kay.sievers@vrfy.org's avatar kay.sievers@vrfy.org Committed by Greg KH

[PATCH] kobject/hotplug split - block core

kobject_add() and kobject_del() don't emit hotplug events anymore. Do it
ourselves if we are finished populating the device directory.
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0700f56b
...@@ -337,6 +337,7 @@ void register_disk(struct gendisk *disk) ...@@ -337,6 +337,7 @@ void register_disk(struct gendisk *disk)
if ((err = kobject_add(&disk->kobj))) if ((err = kobject_add(&disk->kobj)))
return; return;
disk_sysfs_symlinks(disk); disk_sysfs_symlinks(disk);
kobject_hotplug(&disk->kobj, KOBJ_ADD);
/* No minors to use for partitions */ /* No minors to use for partitions */
if (disk->minors == 1) { if (disk->minors == 1) {
...@@ -441,5 +442,6 @@ void del_gendisk(struct gendisk *disk) ...@@ -441,5 +442,6 @@ void del_gendisk(struct gendisk *disk)
sysfs_remove_link(&disk->driverfs_dev->kobj, "block"); sysfs_remove_link(&disk->driverfs_dev->kobj, "block");
put_device(disk->driverfs_dev); put_device(disk->driverfs_dev);
} }
kobject_hotplug(&disk->kobj, KOBJ_REMOVE);
kobject_del(&disk->kobj); kobject_del(&disk->kobj);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment