From: Greg Kroah-Hartman Date: Mon, 14 Jul 2025 09:27:31 +0000 (+0200) Subject: drop queue-6.15/erofs-fix-to-add-missing-tracepoint-in-erofs_readahead.patch X-Git-Tag: v5.15.188~19 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d2be7196e183535fa946dd51b40f54f7345e1eed;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-6.15/erofs-fix-to-add-missing-tracepoint-in-erofs_readahead.patch --- diff --git a/queue-6.15/erofs-fix-to-add-missing-tracepoint-in-erofs_readahead.patch b/queue-6.15/erofs-fix-to-add-missing-tracepoint-in-erofs_readahead.patch deleted file mode 100644 index 25324bbcda..0000000000 --- a/queue-6.15/erofs-fix-to-add-missing-tracepoint-in-erofs_readahead.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d53238b614e01266a3d36b417b60a502e0698504 Mon Sep 17 00:00:00 2001 -From: Chao Yu -Date: Mon, 7 Jul 2025 16:48:32 +0800 -Subject: erofs: fix to add missing tracepoint in erofs_readahead() - -From: Chao Yu - -commit d53238b614e01266a3d36b417b60a502e0698504 upstream. - -Commit 771c994ea51f ("erofs: convert all uncompressed cases to iomap") -converts to use iomap interface, it removed trace_erofs_readahead() -tracepoint in the meantime, let's add it back. - -Fixes: 771c994ea51f ("erofs: convert all uncompressed cases to iomap") -Signed-off-by: Chao Yu -Reviewed-by: Gao Xiang -Link: https://lore.kernel.org/r/20250707084832.2725677-1-chao@kernel.org -Signed-off-by: Gao Xiang -Signed-off-by: Greg Kroah-Hartman ---- - fs/erofs/data.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/fs/erofs/data.c -+++ b/fs/erofs/data.c -@@ -355,6 +355,9 @@ static int erofs_read_folio(struct file - - static void erofs_readahead(struct readahead_control *rac) - { -+ trace_erofs_readahead(rac->mapping->host, readahead_index(rac), -+ readahead_count(rac), true); -+ - return iomap_readahead(rac, &erofs_iomap_ops); - } - diff --git a/queue-6.15/series b/queue-6.15/series index b1b43d0026..385a8fd376 100644 --- a/queue-6.15/series +++ b/queue-6.15/series @@ -118,7 +118,6 @@ dt-bindings-clock-mediatek-add-reset-cells-property-for-mt8188.patch clk-scmi-handle-case-where-child-clocks-are-initialized-before-their-parents.patch smb-server-make-use-of-rdma_destroy_qp.patch ksmbd-fix-a-mount-write-count-leak-in-ksmbd_vfs_kern_path_locked.patch -erofs-fix-to-add-missing-tracepoint-in-erofs_readahead.patch erofs-fix-to-add-missing-tracepoint-in-erofs_read_folio.patch erofs-address-d-cache-aliasing.patch erofs-fix-large-fragment-handling.patch