remove "struct subsystem" as it is no longer needed

We need to work on cleaning up the relationship between kobjects, ksets and
ktypes.  The removal of 'struct subsystem' is the first step of this,
especially as it is not really needed at all.

Thanks to Kay for fixing the bugs in this patch.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

12 files changed, 27 insertions, 29 deletions

diff --git a/fs/configfs/mount.c b/fs/configfs/mount.c
index 6f573004cd7d..b00d962de833 100644
--- a/fs/configfs/mount.c
+++ b/fs/configfs/mount.c
@@ -140,7 +140,7 @@ static int __init configfs_init(void)
         if (!configfs_dir_cachep)
                 goto out;
 
-        kset_set_kset_s(&config_subsys, kernel_subsys);
+        kobj_set_kset_s(&config_subsys, kernel_subsys);
         err = subsystem_register(&config_subsys);
         if (err) {
                 kmem_cache_destroy(configfs_dir_cachep);
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index 7b324cfebcb1..ec8896b264de 100644
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -374,7 +374,7 @@ static int __init debugfs_init(void)
 {
         int retval;
 
-        kset_set_kset_s(&debug_subsys, kernel_subsys);
+        kobj_set_kset_s(&debug_subsys, kernel_subsys);
         retval = subsystem_register(&debug_subsys);
         if (retval)
                 return retval;
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index f40817b53c6f..8e6ad7600236 100644
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -167,7 +167,6 @@ static struct kobj_type dlm_ktype = {
 };
 
 static struct kset dlm_kset = {
-        .subsys = &kernel_subsys,
         .kobj   = {.name = "dlm",},
         .ktype  = &dlm_ktype,
 };
@@ -218,6 +217,7 @@ int dlm_lockspace_init(void)
         INIT_LIST_HEAD(&lslist);
         spin_lock_init(&lslist_lock);
 
+        kobj_set_kset_s(&dlm_kset, kernel_subsys);
         error = kset_register(&dlm_kset);
         if (error)
                 printk("dlm_lockspace_init: cannot register kset %d\n", error);
diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
index fc4a3a224641..6acc8f4fc588 100644
--- a/fs/ecryptfs/main.c
+++ b/fs/ecryptfs/main.c
@@ -793,7 +793,7 @@ static int do_sysfs_registration(void)
                        "Unable to register ecryptfs sysfs subsystem\n");
                 goto out;
         }
-        rc = sysfs_create_file(&ecryptfs_subsys.kset.kobj,
+        rc = sysfs_create_file(&ecryptfs_subsys.kobj,
                                &sysfs_attr_version.attr);
         if (rc) {
                 printk(KERN_ERR
@@ -801,12 +801,12 @@ static int do_sysfs_registration(void)
                 subsystem_unregister(&ecryptfs_subsys);
                 goto out;
         }
-        rc = sysfs_create_file(&ecryptfs_subsys.kset.kobj,
+        rc = sysfs_create_file(&ecryptfs_subsys.kobj,
                                &sysfs_attr_version_str.attr);
         if (rc) {
                 printk(KERN_ERR
                        "Unable to create ecryptfs version_str attribute\n");
-                sysfs_remove_file(&ecryptfs_subsys.kset.kobj,
+                sysfs_remove_file(&ecryptfs_subsys.kobj,
                                   &sysfs_attr_version.attr);
                 subsystem_unregister(&ecryptfs_subsys);
                 goto out;
@@ -841,7 +841,7 @@ static int __init ecryptfs_init(void)
                 ecryptfs_free_kmem_caches();
                 goto out;
         }
-        kset_set_kset_s(&ecryptfs_subsys, fs_subsys);
+        kobj_set_kset_s(&ecryptfs_subsys, fs_subsys);
         sysfs_attr_version.attr.owner = THIS_MODULE;
         sysfs_attr_version_str.attr.owner = THIS_MODULE;
         rc = do_sysfs_registration();
@@ -862,9 +862,9 @@ out:
 
 static void __exit ecryptfs_exit(void)
 {
-        sysfs_remove_file(&ecryptfs_subsys.kset.kobj,
+        sysfs_remove_file(&ecryptfs_subsys.kobj,
                           &sysfs_attr_version.attr);
-        sysfs_remove_file(&ecryptfs_subsys.kset.kobj,
+        sysfs_remove_file(&ecryptfs_subsys.kobj,
                           &sysfs_attr_version_str.attr);
         subsystem_unregister(&ecryptfs_subsys);
         ecryptfs_release_messaging(ecryptfs_transport);
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
index 608db81219a0..bdffe0cfe09a 100644
--- a/fs/fuse/inode.c
+++ b/fs/fuse/inode.c
@@ -731,12 +731,12 @@ static int fuse_sysfs_init(void)
 {
         int err;
 
-        kset_set_kset_s(&fuse_subsys, fs_subsys);
+        kobj_set_kset_s(&fuse_subsys, fs_subsys);
         err = subsystem_register(&fuse_subsys);
         if (err)
                 goto out_err;
 
-        kset_set_kset_s(&connections_subsys, fuse_subsys);
+        kobj_set_kset_s(&connections_subsys, fuse_subsys);
         err = subsystem_register(&connections_subsys);
         if (err)
                 goto out_fuse_unregister;
diff --git a/fs/gfs2/locking/dlm/sysfs.c b/fs/gfs2/locking/dlm/sysfs.c
index 4746b884662d..d9fe3ca40e18 100644
--- a/fs/gfs2/locking/dlm/sysfs.c
+++ b/fs/gfs2/locking/dlm/sysfs.c
@@ -190,7 +190,6 @@ static struct kobj_type gdlm_ktype = {
 };
 
 static struct kset gdlm_kset = {
-        .subsys = &kernel_subsys,
         .kobj   = {.name = "lock_dlm",},
         .ktype  = &gdlm_ktype,
 };
@@ -225,6 +224,7 @@ int gdlm_sysfs_init(void)
 {
         int error;
 
+        kobj_set_kset_s(&gdlm_kset, kernel_subsys);
         error = kset_register(&gdlm_kset);
         if (error)
                 printk("lock_dlm: cannot register kset %d\n", error);
diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index d01f9f0fda26..c26c21b53c19 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -222,7 +222,6 @@ static struct kobj_type gfs2_ktype = {
 };
 
 static struct kset gfs2_kset = {
-        .subsys = &fs_subsys,
         .kobj   = {.name = "gfs2"},
         .ktype  = &gfs2_ktype,
 };
@@ -554,6 +553,7 @@ int gfs2_sys_init(void)
 {
         gfs2_sys_margs = NULL;
         spin_lock_init(&gfs2_sys_margs_lock);
+        kobj_set_kset_s(&gfs2_kset, fs_subsys);
         return kset_register(&gfs2_kset);
 }
 
diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
index 636593bf4d17..2e975c0a35e1 100644
--- a/fs/ocfs2/cluster/masklog.c
+++ b/fs/ocfs2/cluster/masklog.c
@@ -147,7 +147,7 @@ static struct kset mlog_kset = {
         .kobj   = {.name = "logmask", .ktype = &mlog_ktype},
 };
 
-int mlog_sys_init(struct subsystem *o2cb_subsys)
+int mlog_sys_init(struct kset *o2cb_subsys)
 {
         int i = 0;
 
@@ -157,7 +157,7 @@ int mlog_sys_init(struct subsystem *o2cb_subsys)
         }
         mlog_attr_ptrs[i] = NULL;
 
-        mlog_kset.subsys = o2cb_subsys;
+        kobj_set_kset_s(&mlog_kset, o2cb_subsys);
         return kset_register(&mlog_kset);
 }
 
diff --git a/fs/ocfs2/cluster/masklog.h b/fs/ocfs2/cluster/masklog.h
index a42628ba9ddf..75cd877f6d42 100644
--- a/fs/ocfs2/cluster/masklog.h
+++ b/fs/ocfs2/cluster/masklog.h
@@ -278,7 +278,7 @@ extern struct mlog_bits mlog_and_bits, mlog_not_bits;
 
 #include <linux/kobject.h>
 #include <linux/sysfs.h>
-int mlog_sys_init(struct subsystem *o2cb_subsys);
+int mlog_sys_init(struct kset *o2cb_subsys);
 void mlog_sys_shutdown(void);
 
 #endif /* O2CLUSTER_MASKLOG_H */
diff --git a/fs/ocfs2/cluster/sys.c b/fs/ocfs2/cluster/sys.c
index 1d9f6acafa2e..64f6f378fd09 100644
--- a/fs/ocfs2/cluster/sys.c
+++ b/fs/ocfs2/cluster/sys.c
@@ -42,7 +42,6 @@ struct o2cb_attribute {
 #define O2CB_ATTR(_name, _mode, _show, _store)  \
 struct o2cb_attribute o2cb_attr_##_name = __ATTR(_name, _mode, _show, _store)
 
-#define to_o2cb_subsys(k) container_of(to_kset(k), struct subsystem, kset)
 #define to_o2cb_attr(_attr) container_of(_attr, struct o2cb_attribute, attr)
 
 static ssize_t o2cb_interface_revision_show(char *buf)
@@ -79,7 +78,7 @@ static ssize_t
 o2cb_show(struct kobject * kobj, struct attribute * attr, char * buffer)
 {
         struct o2cb_attribute *o2cb_attr = to_o2cb_attr(attr);
-        struct subsystem *sbs = to_o2cb_subsys(kobj);
+        struct kset *sbs = to_kset(kobj);
 
         BUG_ON(sbs != &o2cb_subsys);
 
@@ -93,7 +92,7 @@ o2cb_store(struct kobject * kobj, struct attribute * attr,
              const char * buffer, size_t count)
 {
         struct o2cb_attribute *o2cb_attr = to_o2cb_attr(attr);
-        struct subsystem *sbs = to_o2cb_subsys(kobj);
+        struct kset *sbs = to_kset(kobj);
 
         BUG_ON(sbs != &o2cb_subsys);
 
@@ -112,7 +111,7 @@ int o2cb_sys_init(void)
 {
         int ret;
 
-        o2cb_subsys.kset.kobj.ktype = &o2cb_subsys_type;
+        o2cb_subsys.kobj.ktype = &o2cb_subsys_type;
         ret = subsystem_register(&o2cb_subsys);
         if (ret)
                 return ret;
diff --git a/fs/partitions/check.c b/fs/partitions/check.c
index 8a7d0035ad7a..f01572fca02f 100644
--- a/fs/partitions/check.c
+++ b/fs/partitions/check.c
@@ -312,7 +312,7 @@ static struct attribute * default_attrs[] = {
         NULL,
 };
 
-extern struct subsystem block_subsys;
+extern struct kset block_subsys;
 
 static void part_release(struct kobject *kobj)
 {
@@ -388,7 +388,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.kset.kobj, "subsystem");
+        sysfs_create_link(&p->kobj, &block_subsys.kobj, "subsystem");
         if (flags & ADDPART_FLAG_WHOLEDISK) {
                 static struct attribute addpartattr = {
                         .name = "whole_disk",
@@ -444,7 +444,7 @@ static int disk_sysfs_symlinks(struct gendisk *disk)
                         goto err_out_dev_link;
         }
 
-        err = sysfs_create_link(&disk->kobj, &block_subsys.kset.kobj,
+        err = sysfs_create_link(&disk->kobj, &block_subsys.kobj,
                                 "subsystem");
         if (err)
                 goto err_out_disk_name_lnk;
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c
index db0413a411d6..0e637adc2b87 100644
--- a/fs/sysfs/file.c
+++ b/fs/sysfs/file.c
@@ -13,8 +13,7 @@
 
 #include "sysfs.h"
 
-#define to_subsys(k) container_of(k,struct subsystem,kset.kobj)
-#define to_sattr(a) container_of(a,struct subsys_attribute,attr)
+#define to_sattr(a) container_of(a,struct subsys_attribute, attr)
 
 /*
  * Subsystem file operations.
@@ -24,12 +23,12 @@
 static ssize_t 
 subsys_attr_show(struct kobject * kobj, struct attribute * attr, char * page)
 {
-        struct subsystem * s = to_subsys(kobj);
+        struct kset *kset = to_kset(kobj);
         struct subsys_attribute * sattr = to_sattr(attr);
         ssize_t ret = -EIO;
 
         if (sattr->show)
-                ret = sattr->show(s,page);
+                ret = sattr->show(kset, page);
         return ret;
 }
 
@@ -37,12 +36,12 @@ static ssize_t
 subsys_attr_store(struct kobject * kobj, struct attribute * attr, 
                   const char * page, size_t count)
 {
-        struct subsystem * s = to_subsys(kobj);
+        struct kset *kset = to_kset(kobj);
         struct subsys_attribute * sattr = to_sattr(attr);
         ssize_t ret = -EIO;
 
         if (sattr->store)
-                ret = sattr->store(s,page,count);
+                ret = sattr->store(kset, page, count);
         return ret;
 }