xfs: fix scrub tracepoints when inode-rooted btrees are involved

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: <stable@vger.kernel.org> # v5.7
Fixes: 92219c292af8dd ("xfs: convert btree cursor inode-private member names")
Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/xfs/scrub/trace.h b/fs/xfs/scrub/trace.h
index 93ece6df02e333606bc2cd562c30b448144d4810..0afc978e9983097baa4f640b9012ba8385ea2863 100644 (file)
--- a/fs/xfs/scrub/trace.h
+++ b/fs/xfs/scrub/trace.h
@@ -464,7 +464,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;