[3/4] xfs_repair: use xfs_ialloc_find_prealloc

Commit Message

Darrick J. Wong Dec. 2, 2019, 5:36 p.m. UTC

From: Darrick J. Wong <[e-mail]>

Replace the open-coded first_prealloc_ino computation with a call to
xfs_ialloc_find_prealloc.

Signed-off-by: Darrick J. Wong <[e-mail]>
---
 repair/globals.c    |    3 --
 repair/globals.h    |    3 --
 repair/xfs_repair.c |   70 +--------------------------------------------------
 3 files changed, 2 insertions(+), 74 deletions(-)

Patch

diff --git a/repair/globals.c b/repair/globals.c
index dcd79ea4..91cc49c6 100644
--- a/repair/globals.c
+++ b/repair/globals.c
@@ -74,9 +74,6 @@  int	lost_pquotino;
 
 xfs_agino_t	first_prealloc_ino;
 xfs_agino_t	last_prealloc_ino;
-xfs_agblock_t	bnobt_root;
-xfs_agblock_t	bcntbt_root;
-xfs_agblock_t	inobt_root;
 
 /* configuration vars -- fs geometry dependent */
 
diff --git a/repair/globals.h b/repair/globals.h
index 008bdd90..31dd760c 100644
--- a/repair/globals.h
+++ b/repair/globals.h
@@ -115,9 +115,6 @@  extern int		lost_pquotino;
 
 extern xfs_agino_t	first_prealloc_ino;
 extern xfs_agino_t	last_prealloc_ino;
-extern xfs_agblock_t	bnobt_root;
-extern xfs_agblock_t	bcntbt_root;
-extern xfs_agblock_t	inobt_root;
 
 /* configuration vars -- fs geometry dependent */
 
diff --git a/repair/xfs_repair.c b/repair/xfs_repair.c
index 9295673d..6798b88c 100644
--- a/repair/xfs_repair.c
+++ b/repair/xfs_repair.c
@@ -398,74 +398,8 @@  do_log(char const *msg, ...)
 static void
 calc_mkfs(xfs_mount_t *mp)
 {
-	xfs_agblock_t	fino_bno;
-	int		do_inoalign;
-
-	do_inoalign = M_IGEO(mp)->ialloc_align;
-
-	/*
-	 * Pre-calculate the geometry of ag 0. We know what it looks like
-	 * because we know what mkfs does: 2 allocation btree roots (by block
-	 * and by size), the inode allocation btree root, the free inode
-	 * allocation btree root (if enabled) and some number of blocks to
-	 * prefill the agfl.
-	 *
-	 * Because the current shape of the btrees may differ from the current
-	 * shape, we open code the mkfs freelist block count here. mkfs creates
-	 * single level trees, so the calculation is pertty straight forward for
-	 * the trees that use the AGFL.
-	 */
-	bnobt_root = howmany(4 * mp->m_sb.sb_sectsize, mp->m_sb.sb_blocksize);
-	bcntbt_root = bnobt_root + 1;
-	inobt_root = bnobt_root + 2;
-	fino_bno = inobt_root + (2 * min(2, mp->m_ag_maxlevels)) + 1;
-	if (xfs_sb_version_hasfinobt(&mp->m_sb))
-		fino_bno++;
-	if (xfs_sb_version_hasrmapbt(&mp->m_sb)) {
-		fino_bno += min(2, mp->m_rmap_maxlevels); /* agfl blocks */
-		fino_bno++;
-	}
-	if (xfs_sb_version_hasreflink(&mp->m_sb))
-		fino_bno++;
-
-	/*
-	 * If the log is allocated in the first allocation group we need to
-	 * add the number of blocks used by the log to the above calculation.
-	 *
-	 * This can happens with filesystems that only have a single
-	 * allocation group, or very odd geometries created by old mkfs
-	 * versions on very small filesystems.
-	 */
-	if (mp->m_sb.sb_logstart &&
-	    XFS_FSB_TO_AGNO(mp, mp->m_sb.sb_logstart) == 0) {
-
-		/*
-		 * XXX(hch): verify that sb_logstart makes sense?
-		 */
-		 fino_bno += mp->m_sb.sb_logblocks;
-	}
-
-	/*
-	 * ditto the location of the first inode chunks in the fs ('/')
-	 */
-	if (xfs_sb_version_hasdalign(&mp->m_sb) && do_inoalign)  {
-		first_prealloc_ino = XFS_AGB_TO_AGINO(mp, roundup(fino_bno,
-					mp->m_sb.sb_unit));
-	} else if (xfs_sb_version_hasalign(&mp->m_sb) &&
-					mp->m_sb.sb_inoalignmt > 1)  {
-		first_prealloc_ino = XFS_AGB_TO_AGINO(mp,
-					roundup(fino_bno,
-						mp->m_sb.sb_inoalignmt));
-	} else  {
-		first_prealloc_ino = XFS_AGB_TO_AGINO(mp, fino_bno);
-	}
-
-	ASSERT(M_IGEO(mp)->ialloc_blks > 0);
-
-	if (M_IGEO(mp)->ialloc_blks > 1)
-		last_prealloc_ino = first_prealloc_ino + XFS_INODES_PER_CHUNK;
-	else
-		last_prealloc_ino = XFS_AGB_TO_AGINO(mp, fino_bno + 1);
+	libxfs_ialloc_find_prealloc(mp, &first_prealloc_ino,
+			&last_prealloc_ino);
 
 	/*
 	 * now the first 3 inodes in the system