X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=fs%2Fdlm%2Flockspace.c;h=6353a8384520f20190bc5039fc46e6c006ae5d77;hb=81f8320f624a785d77443ace83391d0fdee695f6;hp=628eaa669e68a8eb2842356dd778122cc6367c3f;hpb=408af0dab78ef4145203b849d6bfd3195f6e3ec9;p=linux-2.6

diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 628eaa669e..6353a83845 100644
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -167,7 +167,6 @@ static struct kobj_type dlm_ktype = {
 };
 
 static struct kset dlm_kset = {
-	.kobj   = {.name = "dlm",},
 	.ktype  = &dlm_ktype,
 };
 
@@ -228,6 +227,7 @@ int dlm_lockspace_init(void)
 	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)