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

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>

diff --git a/fs/xfs/scrub/trace.h b/fs/xfs/scrub/trace.h
index 9b38f5ad1eaf07bcd619c1dca22425a099a360d3..d2ae7e93acb08e82e7b9215a53fdc584c8df69f0 100644 (file)
--- a/fs/xfs/scrub/trace.h
+++ b/fs/xfs/scrub/trace.h
@@ -605,7 +605,7 @@ TRACE_EVENT(xchk_ifork_btree_op_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;
                __assign_str(name);