aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-10-16 12:11:44 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:10 -0500
commit3514faca19a6fdc209734431c509631ea92b094e (patch)
treef6d102e6dec276f8e8d1044b47c74a02b901554f /block
parentc11c4154e7ff4cebfadad849b1e22689d759c3f4 (diff)
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')
-rw-r--r--block/genhd.c5
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 = {
584 .uevent = block_uevent, 584 .uevent = block_uevent,
585}; 585};
586 586
587decl_subsys(block, &ktype_block, &block_uevent_ops); 587decl_subsys(block, &block_uevent_ops);
588 588
589/* 589/*
590 * aggregate disk stat collector. Uses the same stats that the sysfs 590 * 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)
721 } 721 }
722 } 722 }
723 disk->minors = minors; 723 disk->minors = minors;
724 kobj_set_kset_s(disk,block_subsys); 724 disk->kobj.kset = &block_subsys;
725 disk->kobj.ktype = &ktype_block;
725 kobject_init(&disk->kobj); 726 kobject_init(&disk->kobj);
726 rand_initialize_disk(disk); 727 rand_initialize_disk(disk);
727 INIT_WORK(&disk->async_notify, 728 INIT_WORK(&disk->async_notify,