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 05/54] kset: convert fuse to use kset_create
    Date
    Dynamically create the kset instead of declaring it statically.

    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Miklos Szeredi <miklos@szeredi.hu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    fs/fuse/inode.c | 27 +++++++++++++++------------
    1 files changed, 15 insertions(+), 12 deletions(-)

    diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c
    index 2df24c6..ca80a7b 100644
    --- a/fs/fuse/inode.c
    +++ b/fs/fuse/inode.c
    @@ -744,9 +744,6 @@ static inline void unregister_fuseblk(void)
    }
    #endif

    -static decl_subsys(fuse, NULL);
    -static decl_subsys(connections, NULL);
    -
    static void fuse_inode_init_once(struct kmem_cache *cachep, void *foo)
    {
    struct inode * inode = foo;
    @@ -791,32 +788,38 @@ static void fuse_fs_cleanup(void)
    kmem_cache_destroy(fuse_inode_cachep);
    }

    +static struct kset *fuse_kset;
    +static struct kset *connections_kset;
    +
    static int fuse_sysfs_init(void)
    {
    int err;

    - fuse_subsys.kobj.kset = &fs_subsys;
    - err = subsystem_register(&fuse_subsys);
    - if (err)
    + fuse_kset = kset_create_and_register("fuse", NULL, NULL, &fs_subsys);
    + if (IS_ERR(fuse_kset)) {
    + err = PTR_ERR(fuse_kset);
    goto out_err;
    + }

    - connections_subsys.kobj.kset = &fuse_subsys;
    - err = subsystem_register(&connections_subsys);
    - if (err)
    + connections_kset = kset_create_and_register("connections", NULL,
    + NULL, fuse_kset);
    + if (IS_ERR(connections_kset)) {
    + err = PTR_ERR(connections_kset);
    goto out_fuse_unregister;
    + }

    return 0;

    out_fuse_unregister:
    - subsystem_unregister(&fuse_subsys);
    + kset_unregister(fuse_kset);
    out_err:
    return err;
    }

    static void fuse_sysfs_cleanup(void)
    {
    - subsystem_unregister(&connections_subsys);
    - subsystem_unregister(&fuse_subsys);
    + kset_unregister(connections_kset);
    + kset_unregister(fuse_kset);
    }

    static int __init fuse_init(void)
    --
    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:05    [W:3.774 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site