1 files changed, 2 insertions, 4 deletions

diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 6353a8384520..18e4a17b9bee 100644
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -166,9 +166,7 @@ static struct kobj_type dlm_ktype = {
         .release       = lockspace_kobj_release,
 };
 
-static struct kset dlm_kset = {
-        .ktype  = &dlm_ktype,
-};
+static struct kset dlm_kset;
 
 static int kobject_setup(struct dlm_ls *ls)
 {
@@ -228,7 +226,7 @@ int dlm_lockspace_init(void)
         spin_lock_init(&lslist_lock);
 
         kobject_set_name(&dlm_kset.kobj, "dlm");
-        kobj_set_kset_s(&dlm_kset, kernel_subsys);
+        dlm_kset.kobj.kset = &kernel_subsys;
         error = kset_register(&dlm_kset);
         if (error)
                 printk("dlm_lockspace_init: cannot register kset %d\n", error);