This is a note to let you know that I've just added the patch titled
blktrace: use inline function for blk_trace_remove() while blktrace is disabled
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From cbe7cff4a76bc749dd70264ca5cf924e2adf9296 Mon Sep 17 00:00:00 2001
From: Yu Kuai <yukuai3@xxxxxxxxxx>
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 <yukuai3@xxxxxxxxxx>
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 <yukuai3@xxxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Link: https://lore.kernel.org/r/20230610022003.2557284-2-yukuai1@xxxxxxxxxxxxxxx
Signed-off-by: Jens Axboe <axboe@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
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
Patches currently in stable-queue which might be from yukuai3@xxxxxxxxxx are
queue-6.1/md-raid1-10-factor-out-a-helper-to-add-bio-to-plug.patch
queue-6.1/md-raid10-fix-null-ptr-deref-of-mreplace-in-raid10_s.patch
queue-6.1/blk-iocost-use-spin_lock_irqsave-in-adjust_inuse_and.patch
queue-6.1/md-raid10-fix-io-loss-while-replacement-replace-rdev.patch
queue-6.1/md-raid1-10-fix-casting-from-randomized-structure-in-raid1_submit_write.patch
queue-6.1/md-raid1-10-factor-out-a-helper-to-submit-normal-wri.patch
queue-6.1/md-raid1-10-submit-write-io-directly-if-bitmap-is-no.patch
queue-6.1/blk-mq-fix-potential-io-hang-by-wrong-wake_batch.patch
queue-6.1/md-raid10-fix-wrong-setting-of-max_corr_read_errors.patch
queue-6.1/block-fix-blktrace-debugfs-entries-leakage.patch
queue-6.1/blktrace-use-inline-function-for-blk_trace_remove-while-blktrace-is-disabled.patch
queue-6.1/md-raid10-check-slab-out-of-bounds-in-md_bitmap_get_.patch
