From: Greg Kroah-Hartman Date: Sun, 22 Jun 2025 09:06:45 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v5.4.295~80 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71ce80237caf3eb3957e132a9b5d3cb3e855eda8;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: erofs-remove-unused-trace-event-erofs_destroy_inode.patch --- 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 0000000000..2f20883ec9 --- /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 +Date: Tue, 17 Jun 2025 13:40:56 +0800 +Subject: erofs: remove unused trace event erofs_destroy_inode + +From: Gao Xiang + +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 +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 +Signed-off-by: Gao Xiang +Link: https://lore.kernel.org/r/20250617054056.3232365-1-hsiangkao@linux.alibaba.com +Signed-off-by: Greg Kroah-Hartman +--- + 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 9beace8fdd..a0066e8806 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