[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: 19ebc8f84ea12e18dd6c8d3ecaf87bcf4666eee1
WARNING: Author mismatch between patch and upstream commit:
Backport author: Catherine Hoang <catherine.hoang@xxxxxxxxxx>
Commit author: Darrick J. Wong <djwong@xxxxxxxxxx>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Not found
Note: The patch differs from the upstream commit:
---
1: 19ebc8f84ea1 ! 1: 0239567068e5 xfs: fix file_path handling in tracepoints
@@ Metadata
## Commit message ##
xfs: fix file_path handling in tracepoints
+ commit 19ebc8f84ea12e18dd6c8d3ecaf87bcf4666eee1 upstream.
+
+ [backport: only apply fix for 3934e8ebb7cc6]
+
Since file_path() takes the output buffer as one of its arguments, we
might as well have it format directly into the tracepoint's char array
instead of wasting stack space.
@@ Commit message
Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx>
Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Signed-off-by: Chandan Babu R <chandanbabu@xxxxxxxxxx>
+ Signed-off-by: Catherine Hoang <catherine.hoang@xxxxxxxxxx>
+ Acked-by: Darrick J. Wong <djwong@xxxxxxxxxx>
## fs/xfs/scrub/trace.h ##
@@ fs/xfs/scrub/trace.h: TRACE_EVENT(xfile_create,
@@ fs/xfs/scrub/trace.h: TRACE_EVENT(xfile_create,
),
TP_printk("xfino 0x%lx path '%s'",
__entry->ino,
-
- ## fs/xfs/xfs_trace.h ##
-@@ fs/xfs/xfs_trace.h: TRACE_EVENT(xmbuf_create,
- TP_STRUCT__entry(
- __field(dev_t, dev)
- __field(unsigned long, ino)
-- __array(char, pathname, 256)
-+ __array(char, pathname, MAXNAMELEN)
- ),
- TP_fast_assign(
-- char pathname[257];
- char *path;
- struct file *file = btp->bt_file;
-
- __entry->dev = btp->bt_mount->m_super->s_dev;
- __entry->ino = file_inode(file)->i_ino;
-- memset(pathname, 0, sizeof(pathname));
-- path = file_path(file, pathname, sizeof(pathname) - 1);
-+ path = file_path(file, __entry->pathname, MAXNAMELEN);
- if (IS_ERR(path))
-- path = "(unknown)";
-- strncpy(__entry->pathname, path, sizeof(__entry->pathname));
-+ strncpy(__entry->pathname, "(unknown)",
-+ sizeof(__entry->pathname));
- ),
- TP_printk("dev %d:%d xmino 0x%lx path '%s'",
- MAJOR(__entry->dev), MINOR(__entry->dev),
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-6.6.y | Success | Success |
