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

    Cc: Kay Sievers <kay.sievers@vrfy.org>
    Cc: Michael Holzheu <holzheu@de.ibm.com>
    Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    arch/s390/hypfs/inode.c | 15 +++++++++------
    1 files changed, 9 insertions(+), 6 deletions(-)

    diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
    index 387d0e4..b8f124a 100644
    --- a/arch/s390/hypfs/inode.c
    +++ b/arch/s390/hypfs/inode.c
    @@ -490,7 +490,7 @@ static struct super_operations hypfs_s_ops = {
    .show_options = hypfs_show_options,
    };

    -static decl_subsys(s390, NULL);
    +static struct kset *s390_kset;

    static int __init hypfs_init(void)
    {
    @@ -506,17 +506,20 @@ static int __init hypfs_init(void)
    goto fail_diag;
    }
    }
    - s390_subsys.kobj.kset = hypervisor_kset;
    - rc = subsystem_register(&s390_subsys);
    - if (rc)
    +
    + s390_kset = kset_create_and_register("s390", NULL, NULL,
    + hypervisor_kset);
    + if (IS_PTR(s390_kset)) {
    + rc = PTR_ERR(s390_kset);
    goto fail_sysfs;
    + }
    rc = register_filesystem(&hypfs_type);
    if (rc)
    goto fail_filesystem;
    return 0;

    fail_filesystem:
    - subsystem_unregister(&s390_subsys);
    + kset_unregister(s390_kset);
    fail_sysfs:
    if (!MACHINE_IS_VM)
    hypfs_diag_exit();
    @@ -530,7 +533,7 @@ static void __exit hypfs_exit(void)
    if (!MACHINE_IS_VM)
    hypfs_diag_exit();
    unregister_filesystem(&hypfs_type);
    - subsystem_unregister(&s390_subsys);
    + kset_unregister(s390_kset);
    }

    module_init(hypfs_init)
    --
    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:13    [W:4.055 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site