From: Greg Kroah-Hartman Date: Sun, 16 Jul 2023 14:37:08 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.1.39~70 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9608fe51f637bee9f77e966140df043e54b1a44e;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch --- diff --git a/queue-6.1/blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch b/queue-6.1/blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch new file mode 100644 index 00000000000..343824d8278 --- /dev/null +++ b/queue-6.1/blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch @@ -0,0 +1,40 @@ +From cbe7cff4a76bc749dd70264ca5cf924e2adf9296 Mon Sep 17 00:00:00 2001 +From: Yu Kuai +Date: Sat, 10 Jun 2023 10:20:01 +0800 +Subject: blktrace: use inline function for blk_trace_remove() while blktrace is disabled + +From: Yu Kuai + +commit cbe7cff4a76bc749dd70264ca5cf924e2adf9296 upstream. + +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 +Reviewed-by: Christoph Hellwig +Link: https://lore.kernel.org/r/20230610022003.2557284-2-yukuai1@huaweicloud.com +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/blktrace_api.h | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/include/linux/blktrace_api.h ++++ b/include/linux/blktrace_api.h +@@ -85,10 +85,14 @@ extern int blk_trace_remove(struct reque + # 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 diff --git a/queue-6.1/series b/queue-6.1/series index 8aec2a25569..45020b60045 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -581,3 +581,4 @@ regulator-tps65219-fix-matching-interrupts-for-their-regulators.patch arm-dts-qcom-ipq4019-fix-broken-nand-controller-properties-override.patch arm-orion5x-fix-d2net-gpio-initialization.patch leds-trigger-netdev-recheck-netdev_led_mode_linkup-on-dev-rename.patch +blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch