diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-16 10:11:44 -0600 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-01-24 20:40:10 -0800 |
| commit | 3514faca19a6fdc209734431c509631ea92b094e (patch) | |
| tree | f6d102e6dec276f8e8d1044b47c74a02b901554f /block/genhd.c | |
| parent | c11c4154e7ff4cebfadad849b1e22689d759c3f4 (diff) | |
| download | linux-3514faca19a6fdc209734431c509631ea92b094e.tar.bz2 | |
kobject: remove struct kobj_type from struct kset
We don't need a "default" ktype for a kset. We should set this
explicitly every time for each kset. This change is needed so that we
can make ksets dynamic, and cleans up one of the odd, undocumented
assumption that the kset/kobject/ktype model has.
This patch is based on a lot of help from Kay Sievers.
Nasty bug in the block code was found by Dave Young
<hidave.darkstar@gmail.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Dave Young <hidave.darkstar@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'block/genhd.c')
| -rw-r--r-- | block/genhd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/block/genhd.c b/block/genhd.c index f2ac914160d1..32227b7ecd17 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -584,7 +584,7 @@ static struct kset_uevent_ops block_uevent_ops = { .uevent = block_uevent, }; -decl_subsys(block, &ktype_block, &block_uevent_ops); +decl_subsys(block, &block_uevent_ops); /* * aggregate disk stat collector. Uses the same stats that the sysfs @@ -721,7 +721,8 @@ struct gendisk *alloc_disk_node(int minors, int node_id) } } disk->minors = minors; - kobj_set_kset_s(disk,block_subsys); + disk->kobj.kset = &block_subsys; + disk->kobj.ktype = &ktype_block; kobject_init(&disk->kobj); rand_initialize_disk(disk); INIT_WORK(&disk->async_notify, |