1 files changed, 14 insertions, 36 deletions

diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 6353a8384520..5c108c49cb8c 100644
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -166,26 +166,7 @@ static struct kobj_type dlm_ktype = {
         .release       = lockspace_kobj_release,
 };
 
-static struct kset dlm_kset = {
-        .ktype  = &dlm_ktype,
-};
-
-static int kobject_setup(struct dlm_ls *ls)
-{
-        char lsname[DLM_LOCKSPACE_LEN];
-        int error;
-
-        memset(lsname, 0, DLM_LOCKSPACE_LEN);
-        snprintf(lsname, DLM_LOCKSPACE_LEN, "%s", ls->ls_name);
-
-        error = kobject_set_name(&ls->ls_kobj, "%s", lsname);
-        if (error)
-                return error;
-
-        ls->ls_kobj.kset = &dlm_kset;
-        ls->ls_kobj.ktype = &dlm_ktype;
-        return 0;
-}
+static struct kset *dlm_kset;
 
 static int do_uevent(struct dlm_ls *ls, int in)
 {
@@ -220,24 +201,22 @@ static int do_uevent(struct dlm_ls *ls, int in)
 
 int dlm_lockspace_init(void)
 {
-        int error;
-
         ls_count = 0;
         mutex_init(&ls_lock);
         INIT_LIST_HEAD(&lslist);
         spin_lock_init(&lslist_lock);
 
-        kobject_set_name(&dlm_kset.kobj, "dlm");
-        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);
-        return error;
+        dlm_kset = kset_create_and_add("dlm", NULL, kernel_kobj);
+        if (!dlm_kset) {
+                printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__);
+                return -ENOMEM;
+        }
+        return 0;
 }
 
 void dlm_lockspace_exit(void)
 {
-        kset_unregister(&dlm_kset);
+        kset_unregister(dlm_kset);
 }
 
 static int dlm_scand(void *data)
@@ -549,13 +528,12 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
                 goto out_delist;
         }
 
-        error = kobject_setup(ls);
-        if (error)
-                goto out_stop;
-
-        error = kobject_register(&ls->ls_kobj);
+        ls->ls_kobj.kset = dlm_kset;
+        error = kobject_init_and_add(&ls->ls_kobj, &dlm_ktype, NULL,
+                                     "%s", ls->ls_name);
         if (error)
                 goto out_stop;
+        kobject_uevent(&ls->ls_kobj, KOBJ_ADD);
 
         /* let kobject handle freeing of ls if there's an error */
         do_unreg = 1;
@@ -601,7 +579,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
         kfree(ls->ls_rsbtbl);
  out_lsfree:
         if (do_unreg)
-                kobject_unregister(&ls->ls_kobj);
+                kobject_put(&ls->ls_kobj);
         else
                 kfree(ls);
  out:
@@ -750,7 +728,7 @@ static int release_lockspace(struct dlm_ls *ls, int force)
         dlm_clear_members(ls);
         dlm_clear_members_gone(ls);
         kfree(ls->ls_node_array);
-        kobject_unregister(&ls->ls_kobj);
+        kobject_put(&ls->ls_kobj);
         /* The ls structure will be freed when the kobject is done with */
 
         mutex_lock(&ls_lock);