projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bcache: return 0 from bch_debug_init() if CONFIG_DEBUG_FS=n
[linux-2.6-microblaze.git]
/
drivers
/
md
/
bcache
/
debug.c
diff --git
a/drivers/md/bcache/debug.c
b/drivers/md/bcache/debug.c
index
028f7b3
..
d030ce3
100644
(file)
--- a/
drivers/md/bcache/debug.c
+++ b/
drivers/md/bcache/debug.c
@@
-106,7
+106,6
@@
void bch_btree_verify(struct btree *b)
void bch_data_verify(struct cached_dev *dc, struct bio *bio)
{
void bch_data_verify(struct cached_dev *dc, struct bio *bio)
{
- char name[BDEVNAME_SIZE];
struct bio *check;
struct bio_vec bv, cbv;
struct bvec_iter iter, citer = { 0 };
struct bio *check;
struct bio_vec bv, cbv;
struct bvec_iter iter, citer = { 0 };
@@
-134,7
+133,7
@@
void bch_data_verify(struct cached_dev *dc, struct bio *bio)
bv.bv_len),
dc->disk.c,
"verify failed at dev %s sector %llu",
bv.bv_len),
dc->disk.c,
"verify failed at dev %s sector %llu",
-
bdevname(dc->bdev, name)
,
+
dc->backing_dev_name
,
(uint64_t) bio->bi_iter.bi_sector);
kunmap_atomic(p1);
(uint64_t) bio->bi_iter.bi_sector);
kunmap_atomic(p1);
@@
-251,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);
}