From: Greg Kroah-Hartman Date: Mon, 14 Jul 2025 09:30:10 +0000 (+0200) Subject: drop erofs patch from 6.12 and 6.6 as well X-Git-Tag: v5.15.188~18 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8eb1a78ba6122ba95d66ac7c15bf0f6c8c0b05b6;p=thirdparty%2Fkernel%2Fstable-queue.git drop erofs patch from 6.12 and 6.6 as well --- diff --git a/queue-6.12/erofs-fix-to-add-missing-tracepoint-in-erofs_readahead.patch b/queue-6.12/erofs-fix-to-add-missing-tracepoint-in-erofs_readahead.patch deleted file mode 100644 index ba1c719aeb..0000000000 --- a/queue-6.12/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 -@@ -383,6 +383,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.12/series b/queue-6.12/series index cc0fa47d66..4c855616d4 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -99,6 +99,5 @@ x86-mm-disable-hugetlb-page-table-sharing-on-32-bit.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 diff --git a/queue-6.6/erofs-fix-to-add-missing-tracepoint-in-erofs_readahead.patch b/queue-6.6/erofs-fix-to-add-missing-tracepoint-in-erofs_readahead.patch deleted file mode 100644 index 7d6c738c26..0000000000 --- a/queue-6.6/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 -@@ -363,6 +363,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.6/series b/queue-6.6/series index 061fd51205..97a8b38e88 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -61,5 +61,4 @@ x86-rdrand-disable-rdseed-on-amd-cyan-skillfish.patch x86-mm-disable-hugetlb-page-table-sharing-on-32-bit.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