Skip to content

Commit

Permalink
bcache: return 0 from bch_debug_init() if CONFIG_DEBUG_FS=n
Browse files Browse the repository at this point in the history
Commit 539d39e ("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.

Changelog:
v4: Add Acked-by from Kent Overstreet.
v3: Use IS_ENABLED(CONFIG_DEBUG_FS) to replace #ifdef DEBUG_FS.
v2: Remove a warning information
v1: Initial version.

Fixes: Commit 539d39e ("bcache: fix wrong return value in bch_debug_init()")
Cc: stable@vger.kernel.org
Signed-off-by: Coly Li <colyli@suse.de>
Reported-by: Massimo B. <massimo.b@gmx.net>
Reported-by: Kai Krakow <kai@kaishome.de>
Tested-by: Kai Krakow <kai@kaishome.de>
Acked-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
  • Loading branch information
Coly Li authored and Jens Axboe committed May 17, 2018
1 parent 9abd68e commit 1c1a2ee
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion drivers/md/bcache/debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

0 comments on commit 1c1a2ee

Please sign in to comment.