From: Greg Kroah-Hartman Date: Sun, 15 Dec 2024 08:50:09 +0000 (+0100) Subject: 5.10-stable patches X-Git-Tag: v5.4.288~60 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e013d6cd6753cc8b9a50b41ab6f5f8d923d15a92;p=thirdparty%2Fkernel%2Fstable-queue.git 5.10-stable patches added patches: xfs-fix-scrub-tracepoints-when-inode-rooted-btrees-are-involved.patch --- diff --git a/queue-5.10/series b/queue-5.10/series index d4c3806e2a0..e01e2aeee95 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -5,3 +5,4 @@ usb-dwc2-hcd-fix-getportstatus-setportfeature.patch usb-ehci-hcd-fix-call-balance-of-clocks-handling-routines.patch usb-gadget-u_serial-fix-the-issue-that-gs_start_io-crashed-due-to-accessing-null-pointer.patch xfs-don-t-drop-errno-values-when-we-fail-to-ficlone-the-entire-range.patch +xfs-fix-scrub-tracepoints-when-inode-rooted-btrees-are-involved.patch diff --git a/queue-5.10/xfs-fix-scrub-tracepoints-when-inode-rooted-btrees-are-involved.patch b/queue-5.10/xfs-fix-scrub-tracepoints-when-inode-rooted-btrees-are-involved.patch new file mode 100644 index 00000000000..cac018daf27 --- /dev/null +++ b/queue-5.10/xfs-fix-scrub-tracepoints-when-inode-rooted-btrees-are-involved.patch @@ -0,0 +1,33 @@ +From ffc3ea4f3c1cc83a86b7497b0c4b0aee7de5480d Mon Sep 17 00:00:00 2001 +From: "Darrick J. Wong" +Date: Mon, 2 Dec 2024 10:57:32 -0800 +Subject: xfs: fix scrub tracepoints when inode-rooted btrees are involved + +From: Darrick J. Wong + +commit ffc3ea4f3c1cc83a86b7497b0c4b0aee7de5480d upstream. + +Fix a minor mistakes in the scrub tracepoints that can manifest when +inode-rooted btrees are enabled. The existing code worked fine for bmap +btrees, but we should tighten the code up to be less sloppy. + +Cc: # v5.7 +Fixes: 92219c292af8dd ("xfs: convert btree cursor inode-private member names") +Signed-off-by: "Darrick J. Wong" +Reviewed-by: Christoph Hellwig +Signed-off-by: Greg Kroah-Hartman +--- + fs/xfs/scrub/trace.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/fs/xfs/scrub/trace.h ++++ b/fs/xfs/scrub/trace.h +@@ -458,7 +458,7 @@ TRACE_EVENT(xchk_ifork_btree_error, + TP_fast_assign( + xfs_fsblock_t fsbno = xchk_btree_cur_fsbno(cur, level); + __entry->dev = sc->mp->m_super->s_dev; +- __entry->ino = sc->ip->i_ino; ++ __entry->ino = cur->bc_ino.ip->i_ino; + __entry->whichfork = cur->bc_ino.whichfork; + __entry->type = sc->sm->sm_type; + __entry->btnum = cur->bc_btnum;