lkml.org 
[lkml]   [2007]   [Nov]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 13/54] kset: convert dlm to use kset_create
    Date
    Dynamically create the kset instead of declaring it statically.

    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Steven Whitehouse <swhiteho@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    fs/dlm/lockspace.c | 20 +++++++++++---------
    1 files changed, 11 insertions(+), 9 deletions(-)

    diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
    index 18e4a17..28c3cb4 100644
    --- a/fs/dlm/lockspace.c
    +++ b/fs/dlm/lockspace.c
    @@ -166,7 +166,7 @@ static struct kobj_type dlm_ktype = {
    .release = lockspace_kobj_release,
    };

    -static struct kset dlm_kset;
    +static struct kset *dlm_kset;

    static int kobject_setup(struct dlm_ls *ls)
    {
    @@ -180,7 +180,7 @@ static int kobject_setup(struct dlm_ls *ls)
    if (error)
    return error;

    - ls->ls_kobj.kset = &dlm_kset;
    + ls->ls_kobj.kset = dlm_kset;
    ls->ls_kobj.ktype = &dlm_ktype;
    return 0;
    }
    @@ -225,17 +225,19 @@ int dlm_lockspace_init(void)
    INIT_LIST_HEAD(&lslist);
    spin_lock_init(&lslist_lock);

    - kobject_set_name(&dlm_kset.kobj, "dlm");
    - dlm_kset.kobj.kset = &kernel_subsys;
    - error = kset_register(&dlm_kset);
    - if (error)
    - printk("dlm_lockspace_init: cannot register kset %d\n", error);
    - return error;
    + dlm_kset = kset_create_and_register("dlm", NULL, NULL, &kernel_subsys);
    + if (IS_ERR(dlm_kset)) {
    + error = PTR_ERR(dlm_kset);
    + printk(KERN_WARNING "%s: can not create kset %d\n",
    + __FUNCTION__, error);
    + return error;
    + }
    + return 0;
    }

    void dlm_lockspace_exit(void)
    {
    - kset_unregister(&dlm_kset);
    + kset_unregister(dlm_kset);
    }

    static int dlm_scand(void *data)
    --
    1.5.3.4
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-11-03 01:07    [W:0.029 / U:0.228 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site