sugar/linux
1
0
Fork 0
Code Activity

Merge tag 'for-linus-20180518' of git://git.kernel.dk/linux-block

Browse Source 
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
This commit is contained in:
Linus Torvalds
2018-05-18 10:10:43 -07:00
parent 8ccaecd014 1c1a2ee1b5
commit 61c2ad9a2e
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/md/bcache/debug.c
View File

@@ -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);
}