kset: convert block_subsys to use kset_create
Dynamically create the kset instead of declaring it statically. We also rename block_subsys to block_kset to catch all users of this symbol with a build error instead of an easy-to-ignore build warning. Cc: Kay Sievers <kay.sievers@vrfy.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
@@ -316,7 +316,7 @@ static struct attribute * default_attrs[] = {
|
||||
NULL,
|
||||
};
|
||||
|
||||
extern struct kset block_subsys;
|
||||
extern struct kset *block_kset;
|
||||
|
||||
static void part_release(struct kobject *kobj)
|
||||
{
|
||||
@@ -393,7 +393,7 @@ void add_partition(struct gendisk *disk, int part, sector_t start, sector_t len,
|
||||
kobject_add(&p->kobj);
|
||||
if (!disk->part_uevent_suppress)
|
||||
kobject_uevent(&p->kobj, KOBJ_ADD);
|
||||
sysfs_create_link(&p->kobj, &block_subsys.kobj, "subsystem");
|
||||
sysfs_create_link(&p->kobj, &block_kset->kobj, "subsystem");
|
||||
if (flags & ADDPART_FLAG_WHOLEDISK) {
|
||||
static struct attribute addpartattr = {
|
||||
.name = "whole_disk",
|
||||
@@ -448,7 +448,7 @@ static int disk_sysfs_symlinks(struct gendisk *disk)
|
||||
goto err_out_dev_link;
|
||||
}
|
||||
|
||||
err = sysfs_create_link(&disk->kobj, &block_subsys.kobj,
|
||||
err = sysfs_create_link(&disk->kobj, &block_kset->kobj,
|
||||
"subsystem");
|
||||
if (err)
|
||||
goto err_out_disk_name_lnk;
|
||||
|
Reference in New Issue
Block a user