Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=c4a7f5eb5f6a02dcc3a35e47c37c3d221ebc1cc2
Commit: c4a7f5eb5f6a02dcc3a35e47c37c3d221ebc1cc2
Parent: 6f076f5dd9d227cea2704061048894b00cc0d62b
Author: Randy Dunlap <[EMAIL PROTECTED]>
AuthorDate: Thu May 10 03:15:30 2007 -0700
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu May 10 09:26:52 2007 -0700
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] [<ffffffff803426c8>] spin_bug+0x9e/0xe9
[ 2776.221921] [<ffffffff803427bf>] _raw_spin_lock+0x23/0xf9
[ 2776.224417] [<ffffffff8051acf4>] _spin_lock+0x9/0xb
[ 2776.226676] [<ffffffff8033c3b1>] kobject_shadow_add+0x98/0x1ac
[ 2776.229367] [<ffffffff8033c4d0>] kobject_add+0xb/0xd
[ 2776.231665] [<ffffffff8033c4df>] kset_add+0xd/0xf
[ 2776.233845] [<ffffffff8033c5a6>] kset_register+0x23/0x28
[ 2776.236309] [<ffffffff8808ccb7>]
:ocfs2_nodemanager:mlog_sys_init+0x68/0x6d
[ 2776.239518] [<ffffffff8808ccee>]
:ocfs2_nodemanager:o2cb_sys_init+0x32/0x4a
[ 2776.242726] [<ffffffff880b80a6>] :ocfs2_nodemanager:init_o2nm+0xa6/0xd5
[ 2776.245772] [<ffffffff8025266c>] sys_init_module+0x1471/0x15d2
[ 2776.248465] [<ffffffff8033f250>] simple_strtoull+0x0/0xdc
[ 2776.250959] [<ffffffff8020948e>] system_call+0x7e/0x83
Signed-off-by: Randy Dunlap <[EMAIL PROTECTED]>
Acked-by: Mark Fasheh <[EMAIL PROTECTED]>
Cc: Greg KH <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
fs/ocfs2/cluster/masklog.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
index 2e975c0..a93620c 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);
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
