Commit 61c2ad9a authored by Linus Torvalds's avatar Linus Torvalds

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
parents 8ccaecd0 1c1a2ee1
...@@ -250,7 +250,9 @@ void bch_debug_exit(void) ...@@ -250,7 +250,9 @@ void bch_debug_exit(void)
int __init bch_debug_init(struct kobject *kobj) 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); return IS_ERR_OR_NULL(bcache_debug);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment