update "mm/zsmalloc: don't fail if can't create debugfs info"

Some updates to commit d34f615720d1 ("mm/zsmalloc: don't fail if can't
create debugfs info"):

 - add pr_warn to all stat failure cases
 - do not prevent module loading on stat failure

Link: http://lkml.kernel.org/r/1463671123-5479-1-git-send-email-ddstreet@ieee.org
Signed-off-by: Dan Streetman <ddstreet@ieee.org>
Reviewed-by: Ganesh Mahendran <opensource.ganesh@gmail.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Dan Streetman <dan.streetman@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index 72698db958e7e384d51996dfdfd6fa313ee6e2c5..b6d4f258cb53c20ba9d222765ba470d556da396d 100644 (file)
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -45,6 +45,8 @@
  *
  */
 
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
@@ -483,16 +485,16 @@ static inline unsigned long zs_stat_get(struct size_class *class,
 
 #ifdef CONFIG_ZSMALLOC_STAT
 
-static int __init zs_stat_init(void)
+static void __init zs_stat_init(void)
 {
-       if (!debugfs_initialized())
-               return -ENODEV;
+       if (!debugfs_initialized()) {
+               pr_warn("debugfs not available, stat dir not created\n");
+               return;
+       }
 
        zs_stat_root = debugfs_create_dir("zsmalloc", NULL);
        if (!zs_stat_root)
-               return -ENOMEM;
-
-       return 0;
+               pr_warn("debugfs 'zsmalloc' stat dir creation failed\n");
 }
 
 static void __exit zs_stat_exit(void)
@@ -577,8 +579,10 @@ static void zs_pool_stat_create(struct zs_pool *pool, const char *name)
 {
        struct dentry *entry;
 
-       if (!zs_stat_root)
+       if (!zs_stat_root) {
+               pr_warn("no root stat dir, not creating <%s> stat dir\n", name);
                return;
+       }
 
        entry = debugfs_create_dir(name, zs_stat_root);
        if (!entry) {
@@ -592,7 +596,8 @@ static void zs_pool_stat_create(struct zs_pool *pool, const char *name)
        if (!entry) {
                pr_warn("%s: debugfs file entry <%s> creation failed\n",
                                name, "classes");
-               return;
+               debugfs_remove_recursive(pool->stat_dentry);
+               pool->stat_dentry = NULL;
        }
 }
 
@@ -602,9 +607,8 @@ static void zs_pool_stat_destroy(struct zs_pool *pool)
 }
 
 #else /* CONFIG_ZSMALLOC_STAT */
-static int __init zs_stat_init(void)
+static void __init zs_stat_init(void)
 {
-       return 0;
 }
 
 static void __exit zs_stat_exit(void)
@@ -2011,17 +2015,10 @@ static int __init zs_init(void)
        zpool_register_driver(&zs_zpool_driver);
 #endif
 
-       ret = zs_stat_init();
-       if (ret) {
-               pr_err("zs stat initialization failed\n");
-               goto stat_fail;
-       }
+       zs_stat_init();
+
        return 0;
 
-stat_fail:
-#ifdef CONFIG_ZPOOL
-       zpool_unregister_driver(&zs_zpool_driver);
-#endif
 notifier_fail:
        zs_unregister_cpu_notifier();