lkml.org 
[lkml]   [2011]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [ocfs2] Use a kobject instead of a kset
    Date
    From: dann frazier <dann.frazier@canonical.com>

    We currently allocate a kset and add attributes to its internal kobject.
    However, Documentation/kobject.txt says only the kset code should manipulate
    this internal object, and we can get the same results by just creating our
    own kobject and avoiding a kset altogether.

    Signed-off-by: dann frazier <dann.frazier@canonical.com>
    ---
    fs/ocfs2/stackglue.c | 12 ++++++------
    1 files changed, 6 insertions(+), 6 deletions(-)

    diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c
    index 39abf89..7098101 100644
    --- a/fs/ocfs2/stackglue.c
    +++ b/fs/ocfs2/stackglue.c
    @@ -607,29 +607,29 @@ static struct attribute_group ocfs2_attr_group = {
    .attrs = ocfs2_attrs,
    };

    -static struct kset *ocfs2_kset;
    +static struct kobject *ocfs2_kobj;

    static void ocfs2_sysfs_exit(void)
    {
    - kset_unregister(ocfs2_kset);
    + kobject_put(ocfs2_kobj);
    }

    static int ocfs2_sysfs_init(void)
    {
    int ret;

    - ocfs2_kset = kset_create_and_add("ocfs2", NULL, fs_kobj);
    - if (!ocfs2_kset)
    + ocfs2_kobj = kobject_create_and_add("ocfs2", fs_kobj);
    + if (!ocfs2_kobj)
    return -ENOMEM;

    - ret = sysfs_create_group(&ocfs2_kset->kobj, &ocfs2_attr_group);
    + ret = sysfs_create_group(ocfs2_kobj, &ocfs2_attr_group);
    if (ret)
    goto error;

    return 0;

    error:
    - kset_unregister(ocfs2_kset);
    + kobject_put(ocfs2_kobj);
    return ret;
    }

    --
    1.7.2.3


    \
     
     \ /
      Last update: 2011-02-04 17:49    [W:0.022 / U:59.700 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site