From c9aec283bf120bdee532d40cefe20e44c1c9781c Mon Sep 17 00:00:00 2001
From: Petr Pavlu <petr.pavlu@suse.com>
Date: May 23 2023 11:51:20 +0000
Subject: f2fs: Fix f2fs_truncate_partial_nodes ftrace event (git-fixes).


---

diff --git a/patches.suse/f2fs-Fix-f2fs_truncate_partial_nodes-ftrace-event.patch b/patches.suse/f2fs-Fix-f2fs_truncate_partial_nodes-ftrace-event.patch
new file mode 100644
index 0000000..811a135
--- /dev/null
+++ b/patches.suse/f2fs-Fix-f2fs_truncate_partial_nodes-ftrace-event.patch
@@ -0,0 +1,43 @@
+From: Douglas Raillard <douglas.raillard@arm.com>
+Date: Mon, 6 Mar 2023 12:25:49 +0000
+Subject: f2fs: Fix f2fs_truncate_partial_nodes ftrace event
+Git-commit: 0b04d4c0542e8573a837b1d81b94209e48723b25
+Patch-mainline: v6.3-rc5
+References: git-fixes
+
+Fix the nid_t field so that its size is correctly reported in the text
+format embedded in trace.dat files. As it stands, it is reported as
+being of size 4:
+
+        field:nid_t nid[3];     offset:24;      size:4; signed:0;
+
+Instead of 12:
+
+        field:nid_t nid[3];     offset:24;      size:12;        signed:0;
+
+This also fixes the reported offset of subsequent fields so that they
+match with the actual struct layout.
+
+Signed-off-by: Douglas Raillard <douglas.raillard@arm.com>
+Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com>
+Reviewed-by: Chao Yu <chao@kernel.org>
+Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
+Acked-by: Petr Pavlu <petr.pavlu@suse.com>
+---
+ include/trace/events/f2fs.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
+index 1322d34a5dfc..99cbc5949e3c 100644
+--- a/include/trace/events/f2fs.h
++++ b/include/trace/events/f2fs.h
+@@ -512,7 +512,7 @@ TRACE_EVENT(f2fs_truncate_partial_nodes,
+ 	TP_STRUCT__entry(
+ 		__field(dev_t,	dev)
+ 		__field(ino_t,	ino)
+-		__field(nid_t,	nid[3])
++		__array(nid_t,	nid, 3)
+ 		__field(int,	depth)
+ 		__field(int,	err)
+ 	),
+
diff --git a/series.conf b/series.conf
index 9cbe9b1..25c7098 100644
--- a/series.conf
+++ b/series.conf
@@ -63345,6 +63345,7 @@
 	patches.suse/power-supply-da9150-Fix-use-after-free-bug-in-da9150.patch
 	patches.suse/usb-chipidea-core-fix-possible-concurrent-when-switc.patch
 	patches.suse/s390-vfio-ap-fix-memory-leak-in-vfio_ap-device-drive.patch
+	patches.suse/f2fs-Fix-f2fs_truncate_partial_nodes-ftrace-event.patch
 	patches.suse/xen-netback-don-t-do-grant-copy-across-page-boundary.patch
 	patches.suse/xen-netback-use-same-error-messages-for-same-errors.patch
 	patches.suse/NFSv4-Fix-hangs-when-recovering-open-state-after-a-s.patch