summaryrefslogtreecommitdiff
path: root/fs/dlm
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-09-13 02:06:57 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2007-10-13 01:51:02 +0400
commit34980ca8faebfcce31094eba6ffbb0113950361f (patch)
tree1339b5a059fdc34e688d5571749577e8f3f96f09 /fs/dlm
parent7e7654a92a5a75a350cc3458389bc76273498f6a (diff)
downloadlinux-34980ca8faebfcce31094eba6ffbb0113950361f.tar.xz
Drivers: clean up direct setting of the name of a kset
A kset should not have its name set directly, so dynamically set the name at runtime. This is needed to remove the static array in the kobject structure which will be changed in a future patch. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/dlm')
-rw-r--r--fs/dlm/lockspace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 1dc72105ab12..f88f88fdedf1 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)