Merge branch 'for-rmk' of git://git.marvell.com/orion

[linux-2.6-omap-h63xx.git] / fs / ocfs2 / cluster / masklog.c

diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c
index 2b205f5d5790e73d281f6fbf7e298d2f7dc3b782..23c732f275293bfdd24dad2d03ddbb07c7c4b8e8 100644 (file)
--- a/fs/ocfs2/cluster/masklog.c
+++ b/fs/ocfs2/cluster/masklog.c
@@ -74,7 +74,6 @@ struct mlog_attribute {
 #define define_mask(_name) {                   \
        .attr = {                               \
                .name = #_name,                 \
-               .owner = THIS_MODULE,           \
                .mode = S_IRUGO | S_IWUSR,      \
        },                                      \
        .mask = ML_##_name,                     \
@@ -144,10 +143,10 @@ static struct kobj_type mlog_ktype = {
 };
 
 static struct kset mlog_kset = {
-       .kobj   = {.name = "logmask", .ktype = &mlog_ktype},
+       .kobj   = {.ktype = &mlog_ktype},
 };
 
-int mlog_sys_init(struct kset *o2cb_subsys)
+int mlog_sys_init(struct kset *o2cb_kset)
 {
        int i = 0;
 
@@ -157,7 +156,8 @@ int mlog_sys_init(struct kset *o2cb_subsys)
        }
        mlog_attr_ptrs[i] = NULL;
 
-       kobj_set_kset_s(&mlog_kset, *o2cb_subsys);
+       kobject_set_name(&mlog_kset.kobj, "logmask");
+       mlog_kset.kobj.kset = o2cb_kset;
        return kset_register(&mlog_kset);
 }