thp: improve the error code path

Improve the error code path.  Delete unnecessary sysfs file for example.
Also remove the #ifdef xxx to make code better.

Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Johannes Weiner <jweiner@redhat.com>
Cc: Minchan Kim <minchan.kim@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 50 insertions, 21 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index db522e160cca..763711121ef5 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -487,41 +487,68 @@ static struct attribute_group khugepaged_attr_group = {
         .attrs = khugepaged_attr,
         .name = "khugepaged",
 };
-#endif /* CONFIG_SYSFS */
 
-static int __init hugepage_init(void)
+static int __init hugepage_init_sysfs(struct kobject **hugepage_kobj)
 {
         int err;
-#ifdef CONFIG_SYSFS
-        static struct kobject *hugepage_kobj;
-#endif
 
-        err = -EINVAL;
-        if (!has_transparent_hugepage()) {
-                transparent_hugepage_flags = 0;
-                goto out;
-        }
-
-#ifdef CONFIG_SYSFS
-        err = -ENOMEM;
-        hugepage_kobj = kobject_create_and_add("transparent_hugepage", mm_kobj);
-        if (unlikely(!hugepage_kobj)) {
+        *hugepage_kobj = kobject_create_and_add("transparent_hugepage", mm_kobj);
+        if (unlikely(!*hugepage_kobj)) {
                 printk(KERN_ERR "hugepage: failed kobject create\n");
-                goto out;
+                return -ENOMEM;
         }
 
-        err = sysfs_create_group(hugepage_kobj, &hugepage_attr_group);
+        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);
+        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
+
+        return 0;
+
+remove_hp_group:
+        sysfs_remove_group(*hugepage_kobj, &hugepage_attr_group);
+delete_obj:
+        kobject_put(*hugepage_kobj);
+        return err;
+}
+
+static void __init hugepage_exit_sysfs(struct kobject *hugepage_kobj)
+{
+        sysfs_remove_group(hugepage_kobj, &khugepaged_attr_group);
+        sysfs_remove_group(hugepage_kobj, &hugepage_attr_group);
+        kobject_put(hugepage_kobj);
+}
+#else
+static inline int hugepage_init_sysfs(struct kobject **hugepage_kobj)
+{
+        return 0;
+}
+
+static inline void hugepage_exit_sysfs(struct kobject *hugepage_kobj)
+{
+}
+#endif /* CONFIG_SYSFS */
+
+static int __init hugepage_init(void)
+{
+        int err;
+        struct kobject *hugepage_kobj;
+
+        if (!has_transparent_hugepage()) {
+                transparent_hugepage_flags = 0;
+                return -EINVAL;
+        }
+
+        err = hugepage_init_sysfs(&hugepage_kobj);
+        if (err)
+                return err;
 
         err = khugepaged_slab_init();
         if (err)
@@ -545,7 +572,9 @@ static int __init hugepage_init(void)
 
         set_recommended_min_free_kbytes();
 
+        return 0;
 out:
+        hugepage_exit_sysfs(hugepage_kobj);
         return err;
 }
 module_init(hugepage_init)