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

    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Mike Halcrow <mhalcrow@us.ibm.com>
    Cc: Phillip Hellewell <phillip@hellewell.homeip.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    fs/ecryptfs/main.c | 20 ++++++++++----------
    1 files changed, 10 insertions(+), 10 deletions(-)

    diff --git a/fs/ecryptfs/main.c b/fs/ecryptfs/main.c
    index 18ab012..5bfdf96 100644
    --- a/fs/ecryptfs/main.c
    +++ b/fs/ecryptfs/main.c
    @@ -730,7 +730,7 @@ static int ecryptfs_init_kmem_caches(void)
    return 0;
    }

    -static decl_subsys(ecryptfs, NULL);
    +static struct kset *ecryptfs_kset;

    static ssize_t version_show(struct kset *kset, char *buff)
    {
    @@ -794,18 +794,18 @@ static int do_sysfs_registration(void)
    {
    int rc;

    - ecryptfs_subsys.kobj.kset = &fs_subsys;
    - rc = subsystem_register(&ecryptfs_subsys);
    - if (rc) {
    - printk(KERN_ERR
    - "Unable to register ecryptfs sysfs subsystem\n");
    + ecryptfs_kset = kset_create_and_register("ecryptfs", NULL,
    + NULL, &fs_subsys);
    + if (IS_ERR(ecryptfs_kset)) {
    + printk(KERN_ERR "Unable to create ecryptfs kset\n");
    + rc = PTR_ERR(ecryptfs_kset);
    goto out;
    }
    - rc = sysfs_create_group(&ecryptfs_subsys.kobj, &attr_group);
    + rc = sysfs_create_group(&ecryptfs_kset->kobj, &attr_group);
    if (rc) {
    printk(KERN_ERR
    "Unable to create ecryptfs version attributes\n");
    - subsystem_unregister(&ecryptfs_subsys);
    + subsystem_unregister(ecryptfs_kset);
    }
    out:
    return rc;
    @@ -813,8 +813,8 @@ out:

    static void do_sysfs_unregistration(void)
    {
    - sysfs_remove_group(&ecryptfs_subsys.kobj, &attr_group);
    - subsystem_unregister(&ecryptfs_subsys);
    + sysfs_remove_group(&ecryptfs_kset->kobj, &attr_group);
    + subsystem_unregister(ecryptfs_kset);
    }

    static int __init ecryptfs_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:4.591 / U:0.480 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site