leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

blk-mq: fix debugfs compilation issues

Browse Source 
This fixes a couple of problems:

1. In the !CONFIG_DEBUG_FS case, the stub definitions were bogus.
2. In the !CONFIG_BLOCK case, blk-mq-debugfs.c shouldn't be compiled at
   all.

Fix the stub definitions and add a CONFIG_BLK_DEBUG_FS Kconfig option.

Fixes: 07e4fead45 ("blk-mq: create debugfs directory tree")
Signed-off-by: Omar Sandoval <osandov@fb.com>

Augment Kconfig description.

Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Omar Sandoval 2017-01-27 15:03:01 -07:00 committed by Jens Axboe
parent f3a8ab7d55
commit 400f73b23f
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
block/Kconfig
View File

@ -147,6 +147,18 @@ config BLK_WBT_MQ
Multiqueue currently doesn't have support for IO scheduling, Multiqueue currently doesn't have support for IO scheduling,
enabling this option is recommended. enabling this option is recommended.
config BLK_DEBUG_FS
bool "Block layer debugging information in debugfs"
default y
depends on DEBUG_FS
---help---
Include block layer debugging information in debugfs. This information
is mostly useful for kernel developers, but it doesn't incur any cost
at runtime.
Unless you are building a kernel for a tiny system, you should
say Y here.
menu "Partition Types" menu "Partition Types"
source "block/partitions/Kconfig" source "block/partitions/Kconfig"

2
block/Makefile
View File

@ -26,4 +26,4 @@ obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o blk-integrity.o t10-pi.o
obj-$(CONFIG_BLK_MQ_PCI) += blk-mq-pci.o obj-$(CONFIG_BLK_MQ_PCI) += blk-mq-pci.o
obj-$(CONFIG_BLK_DEV_ZONED) += blk-zoned.o obj-$(CONFIG_BLK_DEV_ZONED) += blk-zoned.o
obj-$(CONFIG_BLK_WBT) += blk-wbt.o obj-$(CONFIG_BLK_WBT) += blk-wbt.o
obj-$(CONFIG_DEBUG_FS) += blk-mq-debugfs.o obj-$(CONFIG_BLK_DEBUG_FS) += blk-mq-debugfs.o

11
block/blk-mq.h
View File

@ -84,7 +84,7 @@ extern void blk_mq_hctx_kobj_init(struct blk_mq_hw_ctx *hctx);
/* /*
* debugfs helpers * debugfs helpers
*/ */
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_BLK_DEBUG_FS
void blk_mq_debugfs_init(void); void blk_mq_debugfs_init(void);
int blk_mq_debugfs_register(struct request_queue *q, const char *name); int blk_mq_debugfs_register(struct request_queue *q, const char *name);
void blk_mq_debugfs_unregister(struct request_queue *q); void blk_mq_debugfs_unregister(struct request_queue *q);
@ -95,21 +95,22 @@ static inline void blk_mq_debugfs_init(void)
{ {
} }
int blk_mq_debugfs_register(struct request_queue *q, const char *name); static inline int blk_mq_debugfs_register(struct request_queue *q,
const char *name)
{ {
return 0; return 0;
} }
void blk_mq_debugfs_unregister(struct request_queue *q) static inline void blk_mq_debugfs_unregister(struct request_queue *q)
{ {
} }
int blk_mq_debugfs_register_hctxs(struct request_queue *q) static inline int blk_mq_debugfs_register_hctxs(struct request_queue *q)
{ {
return 0; return 0;
} }
void blk_mq_debugfs_unregister_hctxs(struct request_queue *q) static inline void blk_mq_debugfs_unregister_hctxs(struct request_queue *q)
{ {
} }
#endif #endif