aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-22 11:06:45 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-22 11:06:45 +0200
commit71ce80237caf3eb3957e132a9b5d3cb3e855eda8 (patch)
tree0f4c8919618bc217501aaa877be83a785c66751e
parent48dca48ba0c31d43508041735e600409b95e783e (diff)
downloadstable-queue-71ce80237caf3eb3957e132a9b5d3cb3e855eda8.tar.gz
5.15-stable patches
added patches: erofs-remove-unused-trace-event-erofs_destroy_inode.patch
-rw-r--r--queue-5.15/erofs-remove-unused-trace-event-erofs_destroy_inode.patch51
-rw-r--r--queue-5.15/series1
2 files changed, 52 insertions, 0 deletions
diff --git a/queue-5.15/erofs-remove-unused-trace-event-erofs_destroy_inode.patch b/queue-5.15/erofs-remove-unused-trace-event-erofs_destroy_inode.patch
new file mode 100644
index 00000000000..2f20883ec9c
--- /dev/null
+++ b/queue-5.15/erofs-remove-unused-trace-event-erofs_destroy_inode.patch
@@ -0,0 +1,51 @@
+From 30b58444807c93bffeaba7d776110f2a909d2f9a Mon Sep 17 00:00:00 2001
+From: Gao Xiang <hsiangkao@linux.alibaba.com>
+Date: Tue, 17 Jun 2025 13:40:56 +0800
+Subject: erofs: remove unused trace event erofs_destroy_inode
+
+From: Gao Xiang <hsiangkao@linux.alibaba.com>
+
+commit 30b58444807c93bffeaba7d776110f2a909d2f9a upstream.
+
+The trace event `erofs_destroy_inode` was added but remains unused. This
+unused event contributes approximately 5KB to the kernel module size.
+
+Reported-by: Steven Rostedt <rostedt@goodmis.org>
+Closes: https://lore.kernel.org/r/20250612224906.15000244@batman.local.home
+Fixes: 13f06f48f7bf ("staging: erofs: support tracepoint")
+Cc: stable@vger.kernel.org
+Reviewed-by: Hongbo Li <lihongbo22@huawei.com>
+Signed-off-by: Gao Xiang <hsiangkao@linux.alibaba.com>
+Link: https://lore.kernel.org/r/20250617054056.3232365-1-hsiangkao@linux.alibaba.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ include/trace/events/erofs.h | 18 ------------------
+ 1 file changed, 18 deletions(-)
+
+--- a/include/trace/events/erofs.h
++++ b/include/trace/events/erofs.h
+@@ -235,24 +235,6 @@ DEFINE_EVENT(erofs__map_blocks_exit, z_e
+ TP_ARGS(inode, map, flags, ret)
+ );
+
+-TRACE_EVENT(erofs_destroy_inode,
+- TP_PROTO(struct inode *inode),
+-
+- TP_ARGS(inode),
+-
+- TP_STRUCT__entry(
+- __field( dev_t, dev )
+- __field( erofs_nid_t, nid )
+- ),
+-
+- TP_fast_assign(
+- __entry->dev = inode->i_sb->s_dev;
+- __entry->nid = EROFS_I(inode)->nid;
+- ),
+-
+- TP_printk("dev = (%d,%d), nid = %llu", show_dev_nid(__entry))
+-);
+-
+ #endif /* _TRACE_EROFS_H */
+
+ /* This part must be outside protection */
diff --git a/queue-5.15/series b/queue-5.15/series
index 9beace8fddd..a0066e88060 100644
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -364,3 +364,4 @@ iio-accel-fxls8962af-fix-temperature-calculation.patch
mm-hugetlb-unshare-page-tables-during-vma-split-not-before.patch
mm-hugetlb-independent-pmd-page-table-shared-count.patch
mm-hugetlb-fix-huge_pmd_unshare-vs-gup-fast-race.patch
+erofs-remove-unused-trace-event-erofs_destroy_inode.patch