summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-11-06 10:36:58 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 20:40:23 -0800
commit830d3cfb16728e2496edc2985ad8f68025135e37 (patch)
tree11541c0ac058745a2ab4269b84669a8341ece7ce /fs
parentc60b71787982cefcf9fa09aa281fa8c4c685d557 (diff)
downloadlinux-3.10-830d3cfb16728e2496edc2985ad8f68025135e37.tar.gz
linux-3.10-830d3cfb16728e2496edc2985ad8f68025135e37.tar.bz2
linux-3.10-830d3cfb16728e2496edc2985ad8f68025135e37.zip
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>
Diffstat (limited to 'fs')
-rw-r--r--fs/partitions/check.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 69685bb51c6..9184215f3ef 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -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;