1 files changed, 2 insertions, 4 deletions

diff --git a/fs/gfs2/sys.c b/fs/gfs2/sys.c
index 06e0b7768d97..d7fa54443f0c 100644
--- a/fs/gfs2/sys.c
+++ b/fs/gfs2/sys.c
@@ -221,9 +221,7 @@ static struct kobj_type gfs2_ktype = {
         .sysfs_ops     = &gfs2_attr_ops,
 };
 
-static struct kset gfs2_kset = {
-        .ktype  = &gfs2_ktype,
-};
+static struct kset gfs2_kset;
 
 /*
  * display struct lm_lockstruct fields
@@ -551,7 +549,7 @@ int gfs2_sys_init(void)
         gfs2_sys_margs = NULL;
         spin_lock_init(&gfs2_sys_margs_lock);
         kobject_set_name(&gfs2_kset.kobj, "gfs2");
-        kobj_set_kset_s(&gfs2_kset, fs_subsys);
+        gfs2_kset.kobj.kset = &fs_subsys;
         return kset_register(&gfs2_kset);
 }