bcache: do not check return value of debugfs_create_dir()

Greg KH suggests that normal code should not care about debugfs. Therefore
no matter successful or failed of debugfs_create_dir() execution, it is
unncessary to check its return value.

There are two functions called debugfs_create_dir() and check the return
value, which are bch_debug_init() and closure_debug_init(). This patch
changes these two functions from int to void type, and ignore return values
of debugfs_create_dir().

This patch does not fix exact bug, just makes things work as they should.

Signed-off-by: Coly Li <colyli@suse.de>
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org
Cc: Kai Krakow <kai@kaishome.de>
Cc: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h
index 872ef4d677115f60c7ba6cf8608e5d5b981bc006..0a3e82b0876d88b55eb1a324805efbc9d2f811eb 100644 (file)
--- a/drivers/md/bcache/bcache.h
+++ b/drivers/md/bcache/bcache.h
@@ -1001,7 +1001,7 @@ void bch_open_buckets_free(struct cache_set *);
 int bch_cache_allocator_start(struct cache *ca);
 
 void bch_debug_exit(void);
-int bch_debug_init(struct kobject *);
+void bch_debug_init(struct kobject *kobj);
 void bch_request_exit(void);
 int bch_request_init(void);
 

diff --git a/drivers/md/bcache/closure.c b/drivers/md/bcache/closure.c
index 0e14969182c6e20bbe90511a5e438cf705f7b72e..618253683d409e0a29db0832ec853b5af4930d29 100644 (file)
--- a/drivers/md/bcache/closure.c
+++ b/drivers/md/bcache/closure.c
@@ -199,11 +199,16 @@ static const struct file_operations debug_ops = {
        .release        = single_release
 };
 
-int __init closure_debug_init(void)
+void  __init closure_debug_init(void)
 {
-       closure_debug = debugfs_create_file("closures",
-                               0400, bcache_debug, NULL, &debug_ops);
-       return IS_ERR_OR_NULL(closure_debug);
+       if (!IS_ERR_OR_NULL(bcache_debug))
+               /*
+                * it is unnecessary to check return value of
+                * debugfs_create_file(), we should not care
+                * about this.
+                */
+               closure_debug = debugfs_create_file(
+                       "closures", 0400, bcache_debug, NULL, &debug_ops);
 }
 #endif
 

diff --git a/drivers/md/bcache/closure.h b/drivers/md/bcache/closure.h
index 71427eb5fdaeb191cb435742eab97027a07d0dbd..7c2c5bc7c88b12f1ca7067f0f77c086dc54ef594 100644 (file)
--- a/drivers/md/bcache/closure.h
+++ b/drivers/md/bcache/closure.h
@@ -186,13 +186,13 @@ static inline void closure_sync(struct closure *cl)
 
 #ifdef CONFIG_BCACHE_CLOSURES_DEBUG
 
-int closure_debug_init(void);
+void closure_debug_init(void);
 void closure_debug_create(struct closure *cl);
 void closure_debug_destroy(struct closure *cl);
 
 #else
 
-static inline int closure_debug_init(void) { return 0; }
+static inline void closure_debug_init(void) {}
 static inline void closure_debug_create(struct closure *cl) {}
 static inline void closure_debug_destroy(struct closure *cl) {}
 

diff --git a/drivers/md/bcache/debug.c b/drivers/md/bcache/debug.c
index 04d1467119500e2eb8c4699cdb1a597c06b330b6..12034c07257b87ab82800ed3b2d60c72d7c49e33 100644 (file)
--- a/drivers/md/bcache/debug.c
+++ b/drivers/md/bcache/debug.c
@@ -252,11 +252,12 @@ void bch_debug_exit(void)
                debugfs_remove_recursive(bcache_debug);
 }
 
-int __init bch_debug_init(struct kobject *kobj)
+void __init bch_debug_init(struct kobject *kobj)
 {
-       if (!IS_ENABLED(CONFIG_DEBUG_FS))
-               return 0;
-
+       /*
+        * it is unnecessary to check return value of
+        * debugfs_create_file(), we should not care
+        * about this.
+        */
        bcache_debug = debugfs_create_dir("bcache", NULL);
-       return IS_ERR_OR_NULL(bcache_debug);
 }

diff --git a/drivers/md/bcache/super.c b/drivers/md/bcache/super.c
index e0a92104ca2318dc376c3e3f01b03c2002678dfa..c7ffa6ef3f8276a0c4d1d15644d1a43b35dcb9ef 100644 (file)
--- a/drivers/md/bcache/super.c
+++ b/drivers/md/bcache/super.c
@@ -2345,10 +2345,12 @@ static int __init bcache_init(void)
                goto err;
 
        if (bch_request_init() ||
-           bch_debug_init(bcache_kobj) || closure_debug_init() ||
            sysfs_create_files(bcache_kobj, files))
                goto err;
 
+       bch_debug_init(bcache_kobj);
+       closure_debug_init();
+
        return 0;
 err:
        bcache_exit();