Skip to contentSkip to conversation

bcache: return 0 from bch_debug_init() if CONFIG_DEBUG_FS=n

PATCH In review Coly Li 2 participants 2 messages May 17, 2018

Subsystems (3)
Stable branch Block layer bcache (block layer cache)
lore
Share & tools
lore

Coly Li

author
#0 lore raw

PATCH v3 1/1 bcache: return 0 from bch_debug_init() if CONFIG_DEBUG_FS=n

Commit 539d39eb2708 ("bcache: fix wrong return value in bch_debug_init()") returns the return value of debugfs_create_dir() to bcache_init(). When CONFIG_DEBUG_FS=n, bch_debug_init() always returns 1 and makes bcache_init() failedi.

This patch makes bch_debug_init() always returns 0 if CONFIG_DEBUG_FS=n, so bcache can continue to work for the kernels which don't have debugfs enanbled.

Fixes Commit 539d39eb2708 ("bcache: fix wrong return value in bch_debug_init()")
Cc [email protected]
Signed-off-by Coly Li <[email protected]>
Reported-by Massimo B. <[email protected]>
Reported-by Kai Krakow <[email protected]>
Tested-by Kai Krakow <[email protected]>
Cc Kent Overstreet <[email protected]>
---
 drivers/md/bcache/debug.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/md/bcache/debug.c +3 -1
index 4e63c6f6c04d..d030ce3025a6 100644
@@ -250,7 +250,9 @@ void bch_debug_exit(void)
 
 int __init bch_debug_init(struct kobject *kobj)
 {
-	bcache_debug = debugfs_create_dir("bcache", NULL);
+	if (!IS_ENABLED(CONFIG_DEBUG_FS))
+		return 0;
 
+	bcache_debug = debugfs_create_dir("bcache", NULL);
 	return IS_ERR_OR_NULL(bcache_debug);
 }
Signature · 1 line
2.16.3
Acked-by on v3 1/1
#1 lore raw
Quoted 9 lines · Coly Li

Commit 539d39eb2708 ("bcache: fix wrong return value in bch_debug_init()") returns the return value of debugfs_create_dir() to bcache_init(). When CONFIG_DEBUG_FS=n, bch_debug_init() always returns 1 and makes bcache_init() failedi.

This patch makes bch_debug_init() always returns 0 if CONFIG_DEBUG_FS=n, so bcache can continue to work for the kernels which don't have debugfs enanbled.

Quoted 7 lines
Fixes Commit 539d39eb2708 ("bcache: fix wrong return value in bch_debug_init()")
Cc [email protected]
Signed-off-by Coly Li <[email protected]>
Reported-by Massimo B. <[email protected]>
Reported-by Kai Krakow <[email protected]>
Tested-by Kai Krakow <[email protected]>
Cc Kent Overstreet <[email protected]>
Acked-by Kent Overstreet <[email protected]>