diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-18 10:10:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-05-18 10:10:43 -0700 |
| commit | 61c2ad9a2e223962735b6ff6a5de85f1adcc892b (patch) | |
| tree | fc95c85aabca93f7d2e12ed6e128a586f2977746 | |
| parent | 8ccaecd014bcb52cd6651fb8be15dca6e6b9e04f (diff) | |
| parent | 1c1a2ee1b53b006754073eefc65d2b2cedb5264b (diff) | |
| download | linux-61c2ad9a2e223962735b6ff6a5de85f1adcc892b.tar.bz2 | |
Merge tag 'for-linus-20180518' of git://git.kernel.dk/linux-block
Pull block fix from Jens Axboe:
"Single fix this time, from Coly, fixing a failure case when
CONFIG_DEBUGFS isn't enabled"
* tag 'for-linus-20180518' of git://git.kernel.dk/linux-block:
bcache: return 0 from bch_debug_init() if CONFIG_DEBUG_FS=n
| -rw-r--r-- | drivers/md/bcache/debug.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/md/bcache/debug.c b/drivers/md/bcache/debug.c index 4e63c6f6c04d..d030ce3025a6 100644 --- a/drivers/md/bcache/debug.c +++ b/drivers/md/bcache/debug.c @@ -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); } |