diff options
| author | Darrick J. Wong <djwong@kernel.org> | 2021-09-01 11:17:56 -0700 |
|---|---|---|
| committer | Darrick J. Wong <djwong@kernel.org> | 2021-09-17 18:55:17 -0700 |
| commit | 7d93fe22eb7559f5bb9fd22f23c84d5623ca41d5 (patch) | |
| tree | 9683144f8c9b1d8267b2bd38edea2459008e1327 /fs/xfs | |
| parent | 4972bd486de0d51d5d056081f9a0c1ff10f71733 (diff) | |
xfs: fix scrub tracepoints when inode-rooted btrees are involved
Fix a couple of 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.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
Diffstat (limited to 'fs/xfs')
| -rw-r--r-- | fs/xfs/scrub/trace.c | 2 | ||||
| -rw-r--r-- | fs/xfs/scrub/trace.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/xfs/scrub/trace.c b/fs/xfs/scrub/trace.c index 349b6e9d7d7f..ec649f0b4ac9 100644 --- a/fs/xfs/scrub/trace.c +++ b/fs/xfs/scrub/trace.c @@ -28,7 +28,7 @@ xchk_btree_cur_fsbno( return XFS_DADDR_TO_FSB(cur->bc_mp, xfs_buf_daddr(cur->bc_levels[level].bp)); else if (level == cur->bc_nlevels - 1 && - cur->bc_flags & XFS_BTREE_LONG_PTRS) + (cur->bc_flags & XFS_BTREE_ROOT_IN_INODE)) return XFS_INO_TO_FSB(cur->bc_mp, cur->bc_ino.ip->i_ino); if (!(cur->bc_flags & XFS_BTREE_LONG_PTRS)) return XFS_AGB_TO_FSB(cur->bc_mp, cur->bc_ag.pag->pag_agno, 0); diff --git a/fs/xfs/scrub/trace.h b/fs/xfs/scrub/trace.h index 015703389cbc..d92dd6baa362 100644 --- a/fs/xfs/scrub/trace.h +++ b/fs/xfs/scrub/trace.h @@ -414,7 +414,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; __entry->btnum = cur->bc_btnum; |