From df60b6e4f256ffda545850f76b7b5a18efdd92f2 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Mon, 29 Oct 2007 20:13:17 +0100
Subject: [PATCH] --- yaml --- r: 75743 b: refs/heads/master c:
 136a27507fd09006973f11b17ca971d4c176a06a h: refs/heads/master i:   75741:
 e630b8715b478b8f3fda082171321c256f436a86   75739:
 30c619691a310a2d012276f3e0542145d459c1f9   75735:
 b97f53f38e661a9a0483c5cd1a56d472d3a4ded1   75727:
 a2c308ea8f8193403ebbc9108d367bd87f5ad3b2   75711:
 0e421ea459fa135362fe6d314006161074fff745 v: v3

---
 [refs]                            |  2 +-
 trunk/fs/gfs2/locking/dlm/sysfs.c | 22 ++++++++++------------
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index b17dbd214296..9de9ea1c9298 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9bec101a0c38d559a8c95b44d850cd09a7b4edef
+refs/heads/master: 136a27507fd09006973f11b17ca971d4c176a06a
diff --git a/trunk/fs/gfs2/locking/dlm/sysfs.c b/trunk/fs/gfs2/locking/dlm/sysfs.c
index 93e66b22757f..0a8614088ec6 100644
--- a/trunk/fs/gfs2/locking/dlm/sysfs.c
+++ b/trunk/fs/gfs2/locking/dlm/sysfs.c
@@ -189,7 +189,7 @@ static struct kobj_type gdlm_ktype = {
 	.sysfs_ops     = &gdlm_attr_ops,
 };
 
-static struct kset gdlm_kset;
+static struct kset *gdlm_kset;
 
 int gdlm_kobject_setup(struct gdlm_ls *ls, struct kobject *fskobj)
 {
@@ -201,7 +201,7 @@ int gdlm_kobject_setup(struct gdlm_ls *ls, struct kobject *fskobj)
 		return error;
 	}
 
-	ls->kobj.kset = &gdlm_kset;
+	ls->kobj.kset = gdlm_kset;
 	ls->kobj.ktype = &gdlm_ktype;
 	ls->kobj.parent = fskobj;
 
@@ -219,19 +219,17 @@ void gdlm_kobject_release(struct gdlm_ls *ls)
 
 int gdlm_sysfs_init(void)
 {
-	int error;
-
-	kobject_set_name(&gdlm_kset.kobj, "lock_dlm");
-	gdlm_kset.kobj.kset = &kernel_subsys;
-	error = kset_register(&gdlm_kset);
-	if (error)
-		printk("lock_dlm: cannot register kset %d\n", error);
-
-	return error;
+	gdlm_kset = kset_create_and_add("lock_dlm", NULL,
+					&kernel_subsys.kobj);
+	if (!gdlm_kset) {
+		printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__);
+		return -ENOMEM;
+	}
+	return 0;
 }
 
 void gdlm_sysfs_exit(void)
 {
-	kset_unregister(&gdlm_kset);
+	kset_unregister(gdlm_kset);
 }