lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[133/272] ext4: unregister features interface on module unload
    2.6.37-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Lukas Czerner <lczerner@redhat.com>

    commit 8f021222c1e2756ea4c9dde93b23e1d2a0a4ec37 upstream.

    Ext4 features interface was not properly unregistered which led to
    problems while unloading/reloading ext4 module. This commit fixes that by
    adding proper kobject unregistration code into ext4_exit_fs() as well as
    fail-path of ext4_init_fs()

    Reported-by: Eric Sandeen <sandeen@redhat.com>
    Signed-off-by: Lukas Czerner <lczerner@redhat.com>
    Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    fs/ext4/super.c | 12 ++++++++++--
    1 file changed, 10 insertions(+), 2 deletions(-)

    --- a/fs/ext4/super.c
    +++ b/fs/ext4/super.c
    @@ -4757,7 +4757,7 @@ static struct file_system_type ext4_fs_t
    .fs_flags = FS_REQUIRES_DEV,
    };

    -int __init ext4_init_feat_adverts(void)
    +static int __init ext4_init_feat_adverts(void)
    {
    struct ext4_features *ef;
    int ret = -ENOMEM;
    @@ -4781,6 +4781,13 @@ out:
    return ret;
    }

    +static void ext4_exit_feat_adverts(void)
    +{
    + kobject_put(&ext4_feat->f_kobj);
    + wait_for_completion(&ext4_feat->f_kobj_unregister);
    + kfree(ext4_feat);
    +}
    +
    static int __init ext4_init_fs(void)
    {
    int err;
    @@ -4827,7 +4834,7 @@ out1:
    out2:
    ext4_exit_mballoc();
    out3:
    - kfree(ext4_feat);
    + ext4_exit_feat_adverts();
    remove_proc_entry("fs/ext4", NULL);
    kset_unregister(ext4_kset);
    out4:
    @@ -4846,6 +4853,7 @@ static void __exit ext4_exit_fs(void)
    destroy_inodecache();
    ext4_exit_xattr();
    ext4_exit_mballoc();
    + ext4_exit_feat_adverts();
    remove_proc_entry("fs/ext4", NULL);
    kset_unregister(ext4_kset);
    ext4_exit_system_zone();



    \
     
     \ /
      Last update: 2011-02-16 02:31    [W:0.022 / U:1.480 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site