Petr Pavlu 6ed4e1
From: Douglas Raillard <douglas.raillard@arm.com>
Petr Pavlu 6ed4e1
Date: Mon, 6 Mar 2023 12:25:49 +0000
Petr Pavlu 6ed4e1
Subject: f2fs: Fix f2fs_truncate_partial_nodes ftrace event
Petr Pavlu 6ed4e1
Git-commit: 0b04d4c0542e8573a837b1d81b94209e48723b25
Petr Pavlu 6ed4e1
Patch-mainline: v6.3-rc5
Petr Pavlu 6ed4e1
References: git-fixes
Petr Pavlu 6ed4e1
Petr Pavlu 6ed4e1
Fix the nid_t field so that its size is correctly reported in the text
Petr Pavlu 6ed4e1
format embedded in trace.dat files. As it stands, it is reported as
Petr Pavlu 6ed4e1
being of size 4:
Petr Pavlu 6ed4e1
Petr Pavlu 6ed4e1
        field:nid_t nid[3];     offset:24;      size:4; signed:0;
Petr Pavlu 6ed4e1
Petr Pavlu 6ed4e1
Instead of 12:
Petr Pavlu 6ed4e1
Petr Pavlu 6ed4e1
        field:nid_t nid[3];     offset:24;      size:12;        signed:0;
Petr Pavlu 6ed4e1
Petr Pavlu 6ed4e1
This also fixes the reported offset of subsequent fields so that they
Petr Pavlu 6ed4e1
match with the actual struct layout.
Petr Pavlu 6ed4e1
Petr Pavlu 6ed4e1
Signed-off-by: Douglas Raillard <douglas.raillard@arm.com>
Petr Pavlu 6ed4e1
Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com>
Petr Pavlu 6ed4e1
Reviewed-by: Chao Yu <chao@kernel.org>
Petr Pavlu 6ed4e1
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Petr Pavlu 6ed4e1
Acked-by: Petr Pavlu <petr.pavlu@suse.com>
Petr Pavlu 6ed4e1
---
Petr Pavlu 6ed4e1
 include/trace/events/f2fs.h | 2 +-
Petr Pavlu 6ed4e1
 1 file changed, 1 insertion(+), 1 deletion(-)
Petr Pavlu 6ed4e1
Petr Pavlu 6ed4e1
diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
Petr Pavlu 6ed4e1
index 1322d34a5dfc..99cbc5949e3c 100644
Petr Pavlu 6ed4e1
--- a/include/trace/events/f2fs.h
Petr Pavlu 6ed4e1
+++ b/include/trace/events/f2fs.h
Petr Pavlu 6ed4e1
@@ -512,7 +512,7 @@ TRACE_EVENT(f2fs_truncate_partial_nodes,
Petr Pavlu 6ed4e1
 	TP_STRUCT__entry(
Petr Pavlu 6ed4e1
 		__field(dev_t,	dev)
Petr Pavlu 6ed4e1
 		__field(ino_t,	ino)
Petr Pavlu 6ed4e1
-		__field(nid_t,	nid[3])
Petr Pavlu 6ed4e1
+		__array(nid_t,	nid, 3)
Petr Pavlu 6ed4e1
 		__field(int,	depth)
Petr Pavlu 6ed4e1
 		__field(int,	err)
Petr Pavlu 6ed4e1
 	),
Petr Pavlu 6ed4e1