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>

1 files changed, 1 insertions, 3 deletions

diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index 09a0611b3364..387a63662793 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -365,9 +365,7 @@ static int sysfs_open_file(struct inode *inode, struct file *file)
         /* if the kobject has no ktype, then we assume that it is a subsystem
          * itself, and use ops for it.
          */
-        if (kobj->kset && kobj->kset->ktype)
-                ops = kobj->kset->ktype->sysfs_ops;
-        else if (kobj->ktype)
+        if (kobj->ktype)
                 ops = kobj->ktype->sysfs_ops;
         else
                 ops = &subsys_sysfs_ops;