Skip to content
This repository was archived by the owner on Nov 8, 2023. It is now read-only.

Commit cbe7cff

Browse files
YuKuai-huaweiaxboe
authored andcommitted
blktrace: use inline function for blk_trace_remove() while blktrace is disabled
If config is disabled, call blk_trace_remove() directly will trigger build warning, hence use inline function instead, prepare to fix blktrace debugfs entries leakage. Signed-off-by: Yu Kuai <[email protected]> Reviewed-by: Christoph Hellwig <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]>
1 parent 6dd4423 commit cbe7cff

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

include/linux/blktrace_api.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,14 @@ extern int blk_trace_remove(struct request_queue *q);
8585
# define blk_add_driver_data(rq, data, len) do {} while (0)
8686
# define blk_trace_setup(q, name, dev, bdev, arg) (-ENOTTY)
8787
# define blk_trace_startstop(q, start) (-ENOTTY)
88-
# define blk_trace_remove(q) (-ENOTTY)
8988
# define blk_add_trace_msg(q, fmt, ...) do { } while (0)
9089
# define blk_add_cgroup_trace_msg(q, cg, fmt, ...) do { } while (0)
9190
# define blk_trace_note_message_enabled(q) (false)
91+
92+
static inline int blk_trace_remove(struct request_queue *q)
93+
{
94+
return -ENOTTY;
95+
}
9296
#endif /* CONFIG_BLK_DEV_IO_TRACE */
9397

9498
#ifdef CONFIG_COMPAT

0 commit comments

Comments
 (0)