lkml.org 
[lkml]   [2011]   [Oct]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[patch 1/5]thp: improve the error code path
    From
    Date
    Improve the error code path. Delete unnecessary sysfs file for example.

    Signed-off-by: Shaohua Li <shaohua.li@intel.com>

    ---
    mm/huge_memory.c | 23 ++++++++++++++++-------
    1 file changed, 16 insertions(+), 7 deletions(-)

    Index: linux/mm/huge_memory.c
    ===================================================================
    --- linux.orig/mm/huge_memory.c 2011-10-19 14:07:27.000000000 +0800
    +++ linux/mm/huge_memory.c 2011-10-24 19:24:31.000000000 +0800
    @@ -512,25 +512,23 @@ static int __init hugepage_init(void)
    err = sysfs_create_group(hugepage_kobj, &hugepage_attr_group);
    if (err) {
    printk(KERN_ERR "hugepage: failed register hugeage group\n");
    - goto out;
    + goto delete_obj;
    }

    err = sysfs_create_group(hugepage_kobj, &khugepaged_attr_group);
    if (err) {
    printk(KERN_ERR "hugepage: failed register hugeage group\n");
    - goto out;
    + goto remove_hp_group;
    }
    #endif

    err = khugepaged_slab_init();
    if (err)
    - goto out;
    + goto remove_khp_group;

    err = mm_slots_hash_init();
    - if (err) {
    - khugepaged_slab_free();
    - goto out;
    - }
    + if (err)
    + goto free_slab;

    /*
    * By default disable transparent hugepages on smaller systems,
    @@ -544,7 +542,18 @@ static int __init hugepage_init(void)

    set_recommended_min_free_kbytes();

    + return err;
    +free_slab:
    + khugepaged_slab_free();
    +remove_khp_group:
    +#ifdef CONFIG_SYSFS
    + sysfs_remove_group(hugepage_kobj, &khugepaged_attr_group);
    +remove_hp_group:
    + sysfs_remove_group(hugepage_kobj, &hugepage_attr_group);
    +delete_obj:
    + kobject_put(hugepage_kobj);
    out:
    +#endif
    return err;
    }
    module_init(hugepage_init)



    \
     
     \ /
      Last update: 2011-10-25 04:53    [W:0.023 / U:60.384 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site