[PATCH 2/2] xfs_repair: remove calls to xfs_rtb_round{up,down}_rtx

Darrick J. Wong
2024-10-11T01:24:34Z

The kernel will remove xfs_rtb_roundup_rtx soon, so open code the single
caller using the mod value that we already computed.

The kernel will remove xfs_rtb_rounddown_rtx soon, so remove the call
because the xfs_rtb_to_rtx call below it already does the rounding for
us.

Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
repair/dinode.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/repair/dinode.c b/repair/dinode.c
index 1d2d4ffa6d0e53..e59d358e8439a2 100644
--- a/repair/dinode.c
+++ b/repair/dinode.c
@@ -197,7 +197,7 @@ process_rt_rec_dups(
xfs_rtblock_t b;
xfs_rtxnum_t ext;

- for (b = xfs_rtb_rounddown_rtx(mp, irec->br_startblock);
+ for (b = irec->br_startblock;
b < irec->br_startblock + irec->br_blockcount;
b += mp->m_sb.sb_rextsize) {
ext = xfs_rtb_to_rtx(mp, b);
@@ -245,7 +245,7 @@ process_rt_rec_state(
do_error(
_("data fork in rt inode %" PRIu64 " found invalid rt extent %"PRIu64" state %d at rt block %"PRIu64"\n"),
ino, ext, state, b);
- b = xfs_rtb_roundup_rtx(mp, b);
+ b += mp->m_sb.sb_rextsize - mod;
continue;
}