From: Andrew Morton <akpm@linux-foundation.org>

Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 fs/gfs2/locking/dlm/sysfs.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN fs/gfs2/locking/dlm/sysfs.c~fix-gregkh-driver-drivers-clean-up-direct-setting-of-the-name-of-a-kset fs/gfs2/locking/dlm/sysfs.c
--- a/fs/gfs2/locking/dlm/sysfs.c~fix-gregkh-driver-drivers-clean-up-direct-setting-of-the-name-of-a-kset
+++ a/fs/gfs2/locking/dlm/sysfs.c
@@ -223,7 +223,7 @@ int gdlm_sysfs_init(void)
 {
 	int error;
 
-	kobject_set_name(&gdlm_kset, "lock_dlm");
+	kobject_set_name(&gdlm_kset.kobj, "lock_dlm");
 	kobj_set_kset_s(&gdlm_kset, kernel_subsys);
 	error = kset_register(&gdlm_kset);
 	if (error)
_