aboutsummaryrefslogtreecommitdiffstats
path: root/fs/dlm
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-11-06 13:36:58 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:24 -0500
commit0ff21e46630abce11fdaaffabd72bbd4eed5ac2c (patch)
treecc49671622ef90775bf12a91d20b8286aa346e6f /fs/dlm
parent5c03c7ab886859eb195440dbb6ccb8c30c4e84cc (diff)
kobject: convert kernel_kset to be a kobject
kernel_kset does not need to be a kset, but a much simpler kobject now that we have kobj_attributes. We also rename kernel_kset to kernel_kobj to catch all users of this symbol with a build error instead of an easy-to-ignore build warning. Cc: Kay Sievers <kay.sievers@vrfy.org> 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 0828beb2d35d..e64b0dc664f3 100644
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -223,7 +223,7 @@ int dlm_lockspace_init(void)
223 INIT_LIST_HEAD(&lslist); 223 INIT_LIST_HEAD(&lslist);
224 spin_lock_init(&lslist_lock); 224 spin_lock_init(&lslist_lock);
225 225
226 dlm_kset = kset_create_and_add("dlm", NULL, &kernel_kset->kobj); 226 dlm_kset = kset_create_and_add("dlm", NULL, kernel_kobj);
227 if (!dlm_kset) { 227 if (!dlm_kset) {
228 printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__); 228 printk(KERN_WARNING "%s: can not create kset\n", __FUNCTION__);
229 return -ENOMEM; 229 return -ENOMEM;