kset: convert kernel_subsys to use kset_create

[linux-2.6] / fs / gfs2 / sys.c

diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index ba3a1729cc1a8016f90d46cb9aee626aa171ca6f..44cfaae92e764376e5455e44cc1c858a15e0bd39 100644 (file)
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -221,10 +221,7 @@ static struct kobj_type gfs2_ktype = {
        .sysfs_ops     = &gfs2_attr_ops,
 };
 
-static struct kset gfs2_kset = {
-       .kobj   = {.name = "gfs2"},
-       .ktype  = &gfs2_ktype,
-};
+static struct kset *gfs2_kset;
 
 /*
  * display struct lm_lockstruct fields
@@ -496,7 +493,7 @@ int gfs2_sys_fs_add(struct gfs2_sbd *sdp)
 {
        int error;
 
-       sdp->sd_kobj.kset = &gfs2_kset;
+       sdp->sd_kobj.kset = gfs2_kset;
        sdp->sd_kobj.ktype = &gfs2_ktype;
 
        error = kobject_set_name(&sdp->sd_kobj, "%s", sdp->sd_table_name);
@@ -551,13 +548,15 @@ 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);
+       gfs2_kset = kset_create_and_add("gfs2", NULL, fs_kobj);
+       if (!gfs2_kset)
+               return -ENOMEM;
+       return 0;
 }
 
 void gfs2_sys_uninit(void)
 {
        kfree(gfs2_sys_margs);
-       kset_unregister(&gfs2_kset);
+       kset_unregister(gfs2_kset);
 }