projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[powerpc.git]
/
fs
/
dlm
/
lockspace.c
diff --git
a/fs/dlm/lockspace.c
b/fs/dlm/lockspace.c
index
f607ca2
..
a677b2a
100644
(file)
--- 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 = {
};
static struct kset dlm_kset = {
- .subsys = &kernel_subsys,
.kobj = {.name = "dlm",},
.ktype = &dlm_ktype,
};
.kobj = {.name = "dlm",},
.ktype = &dlm_ktype,
};
@@
-218,6
+217,7
@@
int dlm_lockspace_init(void)
INIT_LIST_HEAD(&lslist);
spin_lock_init(&lslist_lock);
INIT_LIST_HEAD(&lslist);
spin_lock_init(&lslist_lock);
+ kobj_set_kset_s(&dlm_kset, kernel_subsys);
error = kset_register(&dlm_kset);
if (error)
printk("dlm_lockspace_init: cannot register kset %d\n", error);
error = kset_register(&dlm_kset);
if (error)
printk("dlm_lockspace_init: cannot register kset %d\n", error);