diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-09-13 00:06:57 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-12 23:51:02 +0200 |
commit | 34980ca8faebfcce31094eba6ffbb0113950361f (patch) | |
tree | 1339b5a059fdc34e688d5571749577e8f3f96f09 /fs/ocfs2/cluster/masklog.c | |
parent | cdev: remove unneeded setting of cdev names (diff) | |
download | linux-34980ca8faebfcce31094eba6ffbb0113950361f.tar.xz linux-34980ca8faebfcce31094eba6ffbb0113950361f.zip |
Drivers: clean up direct setting of the name of a kset
A kset should not have its name set directly, so dynamically set the
name at runtime.
This is needed to remove the static array in the kobject structure which
will be changed in a future patch.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs/ocfs2/cluster/masklog.c')
-rw-r--r-- | fs/ocfs2/cluster/masklog.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ocfs2/cluster/masklog.c b/fs/ocfs2/cluster/masklog.c index e9e042b93dbf..a4882c8df945 100644 --- a/fs/ocfs2/cluster/masklog.c +++ b/fs/ocfs2/cluster/masklog.c @@ -143,7 +143,7 @@ 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) @@ -156,6 +156,7 @@ int mlog_sys_init(struct kset *o2cb_subsys) } mlog_attr_ptrs[i] = NULL; + kobject_set_name(&mlog_kset.kobj, "logmask"); kobj_set_kset_s(&mlog_kset, *o2cb_subsys); return kset_register(&mlog_kset); } |