]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.4-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Jun 2025 09:06:28 +0000 (11:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 22 Jun 2025 09:06:28 +0000 (11:06 +0200)
added patches:
erofs-remove-unused-trace-event-erofs_destroy_inode.patch

queue-5.4/erofs-remove-unused-trace-event-erofs_destroy_inode.patch [new file with mode: 0644]
queue-5.4/series

diff --git a/queue-5.4/erofs-remove-unused-trace-event-erofs_destroy_inode.patch b/queue-5.4/erofs-remove-unused-trace-event-erofs_destroy_inode.patch
new file mode 100644 (file)
index 0000000..2f20883
--- /dev/null
@@ -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 */
index 2bfbac38fb653f8e123f3a6bd04f1a6cbb27a300..a1ff7eb85fca66c49405af1f50c8a7c744dec32e 100644 (file)
@@ -197,3 +197,4 @@ input-sparcspkr-avoid-unannotated-fall-through.patch
 arm64-restrict-pagetable-teardown-to-avoid-false-warning.patch
 alsa-hda-intel-add-thinkpad-e15-to-pm-deny-list.patch
 alsa-hda-realtek-enable-headset-mic-on-latitude-5420-rugged.patch
+erofs-remove-unused-trace-event-erofs_destroy_inode.patch