From c4a7f5eb5f6a02dcc3a35e47c37c3d221ebc1cc2 Mon Sep 17 00:00:00 2001 From: Randy Dunlap Date: Thu, 10 May 2007 03:15:30 -0700 Subject: [PATCH] ocfs2: kobject/kset foobar Fix gcc warning and Oops that it causes: fs/ocfs2/cluster/masklog.c:161: warning: assignment from incompatible pointer type [ 2776.204120] OCFS2 Node Manager 1.3.3 [ 2776.211729] BUG: spinlock bad magic on CPU#0, modprobe/4424 [ 2776.214269] lock: ffff810021c8fe18, .magic: ffffffff, .owner: /6394416, .owner_cpu: 0 [ 2776.217864] [ 2776.217865] Call Trace: [ 2776.219662] [] spin_bug+0x9e/0xe9 [ 2776.221921] [] _raw_spin_lock+0x23/0xf9 [ 2776.224417] [] _spin_lock+0x9/0xb [ 2776.226676] [] kobject_shadow_add+0x98/0x1ac [ 2776.229367] [] kobject_add+0xb/0xd [ 2776.231665] [] kset_add+0xd/0xf [ 2776.233845] [] kset_register+0x23/0x28 [ 2776.236309] [] :ocfs2_nodemanager:mlog_sys_init+0x68/0x6d [ 2776.239518] [] :ocfs2_nodemanager:o2cb_sys_init+0x32/0x4a [ 2776.242726] [] :ocfs2_nodemanager:init_o2nm+0xa6/0xd5 [ 2776.245772] [] sys_init_module+0x1471/0x15d2 [ 2776.248465] [] simple_strtoull+0x0/0xdc [ 2776.250959] [] system_call+0x7e/0x83 Signed-off-by: Randy Dunlap Acked-by: Mark Fasheh Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- fs/ocfs2/cluster/masklog.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c index 2e975c0a35e1..a93620ce4aca 100644 --- a/fs/ocfs2/cluster/masklog.c +++ b/fs/ocfs2/cluster/masklog.c @@ -144,7 +144,8 @@ static struct kobj_type mlog_ktype = { }; static struct kset mlog_kset = { - .kobj = {.name = "logmask", .ktype = &mlog_ktype}, + .kobj = {.name = "logmask"}, + .ktype = &mlog_ktype }; int mlog_sys_init(struct kset *o2cb_subsys) @@ -157,7 +158,7 @@ int mlog_sys_init(struct kset *o2cb_subsys) } mlog_attr_ptrs[i] = NULL; - kobj_set_kset_s(&mlog_kset, o2cb_subsys); + kobj_set_kset_s(&mlog_kset, *o2cb_subsys); return kset_register(&mlog_kset); } -- 2.20.1