bcache: return 0 from bch_debug_init() if CONFIG_DEBUG_FS=n
Subsystems (3)
PATCH v2 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.
--- drivers/md/bcache/bcache.h | 5 +++++ drivers/md/bcache/debug.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-)
drivers/md/bcache/bcache.h +5 -0
@@ -994,8 +994,13 @@ void bch_open_buckets_free(struct cache_set *);int bch_cache_allocator_start (struct cache *ca); +#ifdef CONFIG_DEBUG_FS void bch_debug_exit (void );int bch_debug_init (struct kobject *); +#else +static inline void bch_debug_exit (void ) {}; +static inline int bch_debug_init (struct kobject *kobj) {return 0 ; }; +#endif void bch_request_exit (void );int bch_request_init (void );
drivers/md/bcache/debug.c +4 -4
@@ -17,8 +17,6 @@#include <linux/random.h> #include <linux/seq_file.h> -struct dentry *bcache_debug; -#ifdef CONFIG_BCACHE_DEBUG #define for_each_written_bset (b, start, i) \
@@ -151,6 +149,8 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)/* XXX: cache set refcounting */ +struct dentry *bcache_debug; +struct dump_iterator {char buf[PAGE_SIZE ];size_t bytes;
@@ -240,8 +240,6 @@ void bch_debug_init_cache_set(struct cache_set *c) } } -#endif -void bch_debug_exit (void ) {if (!IS_ERR_OR_NULL (bcache_debug))
@@ -254,3 +252,5 @@ int __init bch_debug_init(struct kobject *kobj) return IS_ERR_OR_NULL(bcache_debug); } + +#endif
Signature · 1 line
2.16.3
Quoted 26 lines · Coly Li
Commit
539d39eb2708("bcache: fix wrong return value inbch_debug_init()") returns the return value ofdebugfs_create_dir()tobcache_init(). WhenCONFIG_DEBUG_FS=n,bch_debug_init()always returns 1 and makesbcache_init()failedi.This patch makes
bch_debug_init()always returns 0 ifCONFIG_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()")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/bcache.h | 5 +++++ drivers/md/bcache/debug.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-)drivers/md/bcache/bcache.h +0
-0
drivers/md/bcache/bcache.h void bch_open_buckets_free(struct cache_set *); · line 997
Quoted 4 lines
drivers/md/bcache/bcache.h +1
-0@@ -994,8 +994,13 @@ void bch_open_buckets_free(struct cache_set *);int bch_cache_allocator_start (struct cache *ca); +#ifdef CONFIG_DEBUG_FS
you could just use if (IS_ENABLED(CONFIG_DEBUG_FS)) in bch_debug_init, that way you don't need to add an #ifdef
Quoted 49 lines
drivers/md/bcache/bcache.h +4
-0void bch_debug_exit (void );int bch_debug_init (struct kobject *); +#else +static inline void bch_debug_exit (void ) {}; +static inline int bch_debug_init (struct kobject *kobj) {return 0 ; }; +#endif void bch_request_exit (void );int bch_request_init (void );drivers/md/bcache/debug.c +4
-4@@ -17,8 +17,6 @@#include <linux/random.h> #include <linux/seq_file.h> -struct dentry *bcache_debug; -#ifdef CONFIG_BCACHE_DEBUG #define for_each_written_bset (b, start, i) \@@ -151,6 +149,8 @@ void bch_data_verify(struct cached_dev *dc, struct bio *bio)/* XXX: cache set refcounting */ +struct dentry *bcache_debug; +struct dump_iterator {char buf[PAGE_SIZE ];size_t bytes;@@ -240,8 +240,6 @@ void bch_debug_init_cache_set(struct cache_set *c) } } -#endif -void bch_debug_exit (void ) {if (!IS_ERR_OR_NULL (bcache_debug))@@ -254,3 +252,5 @@ int __init bch_debug_init(struct kobject *kobj) return IS_ERR_OR_NULL(bcache_debug); } + +#endif Signature · 1 line
2.16.3
Quoted 28 lines · Kent Overstreet
Quoted 27 lines · Coly Li
Commit
539d39eb2708("bcache: fix wrong return value inbch_debug_init()") returns the return value ofdebugfs_create_dir()tobcache_init(). WhenCONFIG_DEBUG_FS=n,bch_debug_init()always returns 1 and makesbcache_init()failedi.This patch makes
bch_debug_init()always returns 0 ifCONFIG_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()")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/bcache.h | 5 +++++ drivers/md/bcache/debug.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-)drivers/md/bcache/bcache.h +0
-0@@ -994,8 +994,13 @@ void bch_open_buckets_free(struct cache_set *);
Quoted 7 lines
drivers/md/bcache/bcache.h void bch_open_buckets_free(struct cache_set *); · line 997
Quoted 3 lines
drivers/md/bcache/bcache.h +1
-0int bch_cache_allocator_start (struct cache *ca); +#ifdef CONFIG_DEBUG_FS you could just use if (
IS_ENABLED(CONFIG_DEBUG_FS)) inbch_debug_init, that way you don't need to add an #ifdef
Yes, it is much simpler. v3 patch resent for your review.
Thanks for the hint.
Coly Li