Commit cbe7cff4 authored by Yu Kuai's avatar Yu Kuai Committed by Jens Axboe
Browse files

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: default avatarYu Kuai <yukuai3@huawei.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Link: https://lore.kernel.org/r/20230610022003.2557284-2-yukuai1@huaweicloud.com


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 6dd4423f

include/linux/blktrace_api.h

+5 −1
Original line number Diff line number Diff line
@@ -85,10 +85,14 @@ extern int blk_trace_remove(struct request_queue *q); 
# define blk_add_driver_data(rq, data, len)		do {} while (0)

# define blk_trace_setup(q, name, dev, bdev, arg)	(-ENOTTY)

# define blk_trace_startstop(q, start)			(-ENOTTY)

# define blk_trace_remove(q)				(-ENOTTY)

# define blk_add_trace_msg(q, fmt, ...)			do { } while (0)

# define blk_add_cgroup_trace_msg(q, cg, fmt, ...)	do { } while (0)

# define blk_trace_note_message_enabled(q)		(false)



static inline int blk_trace_remove(struct request_queue *q)

{

	return -ENOTTY;

}

#endif /* CONFIG_BLK_DEV_IO_TRACE */



#ifdef CONFIG_COMPAT