Commit 43004b2a authored by Darrick J. Wong's avatar Darrick J. Wong
Browse files

xfs: add a block to inode count converter 



Add new helpers to convert units of fs blocks into inodes, and AG blocks
into AG inodes, respectively.  Convert all the open-coded conversions
and XFS_OFFBNO_TO_AGINO(, , 0) calls to use them, as appropriate.  The
OFFBNO_TO_AGINO macro is retained for xfs_repair.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
parent 7280feda

fs/xfs/libxfs/xfs_format.h

+2 −0
Original line number Diff line number Diff line
@@ -1083,6 +1083,8 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev) 
	((i) & XFS_INO_MASK(XFS_INO_OFFSET_BITS(mp)))

#define	XFS_OFFBNO_TO_AGINO(mp,b,o)	\

	((xfs_agino_t)(((b) << XFS_INO_OFFSET_BITS(mp)) | (o)))

#define	XFS_FSB_TO_INO(mp, b)	((xfs_ino_t)((b) << XFS_INO_OFFSET_BITS(mp)))

#define	XFS_AGB_TO_AGINO(mp, b)	((xfs_agino_t)((b) << XFS_INO_OFFSET_BITS(mp)))



#define	XFS_MAXINUMBER		((xfs_ino_t)((1ULL << 56) - 1ULL))

#define	XFS_MAXINUMBER_32	((xfs_ino_t)((1ULL << 32) - 1ULL))

fs/xfs/libxfs/xfs_ialloc.c

+8 −9
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ xfs_ialloc_inode_init( 
	 * blocks size.

	 */

	blks_per_cluster = xfs_icluster_size_fsb(mp);

	inodes_per_cluster = blks_per_cluster << mp->m_sb.sb_inopblog;

	inodes_per_cluster = XFS_FSB_TO_INO(mp, blks_per_cluster);

	nbufs = length / blks_per_cluster;



	/*
@@ -312,7 +312,7 @@ xfs_ialloc_inode_init( 
	 *

	 * For v3 inodes, we also need to write the inode number into the inode,

	 * so calculate the first inode number of the chunk here as

	 * XFS_OFFBNO_TO_AGINO() only works within a filesystem block, not

	 * XFS_AGB_TO_AGINO() only works within a filesystem block, not

	 * across multiple filesystem blocks (such as a cluster) and so cannot

	 * be used in the cluster buffer loop below.

	 *
@@ -324,8 +324,7 @@ xfs_ialloc_inode_init( 
	 */

	if (xfs_sb_version_hascrc(&mp->m_sb)) {

		version = 3;

		ino = XFS_AGINO_TO_INO(mp, agno,

				       XFS_OFFBNO_TO_AGINO(mp, agbno, 0));

		ino = XFS_AGINO_TO_INO(mp, agno, XFS_AGB_TO_AGINO(mp, agbno));



		/*

		 * log the initialisation that is about to take place as an
@@ -445,7 +444,7 @@ xfs_align_sparse_ino( 
		return;



	/* calculate the inode offset and align startino */

	offset = mod << mp->m_sb.sb_inopblog;

	offset = XFS_AGB_TO_AGINO(mp, mod);

	*startino -= offset;



	/*
@@ -797,7 +796,7 @@ sparse_alloc: 
		if (error)

			return error;



		newlen = args.len << args.mp->m_sb.sb_inopblog;

		newlen = XFS_AGB_TO_AGINO(args.mp, args.len);

		ASSERT(newlen <= XFS_INODES_PER_CHUNK);

		allocmask = (1 << (newlen / XFS_INODES_PER_HOLEMASK_BIT)) - 1;

	}
@@ -825,7 +824,7 @@ sparse_alloc: 
	/*

	 * Convert the results.

	 */

	newino = XFS_OFFBNO_TO_AGINO(args.mp, args.agbno, 0);

	newino = XFS_AGB_TO_AGINO(args.mp, args.agbno);



	if (xfs_inobt_issparse(~allocmask)) {

		/*
@@ -2724,8 +2723,8 @@ xfs_ialloc_has_inodes_at_extent( 
	xfs_agino_t		low;

	xfs_agino_t		high;



	low = XFS_OFFBNO_TO_AGINO(cur->bc_mp, bno, 0);

	high = XFS_OFFBNO_TO_AGINO(cur->bc_mp, bno + len, 0) - 1;

	low = XFS_AGB_TO_AGINO(cur->bc_mp, bno);

	high = XFS_AGB_TO_AGINO(cur->bc_mp, bno + len) - 1;



	return xfs_ialloc_has_inode_record(cur, low, high, exists);

}

fs/xfs/libxfs/xfs_types.c

+2 −2
Original line number Diff line number Diff line
@@ -89,14 +89,14 @@ xfs_agino_range( 
	 */

	bno = round_up(XFS_AGFL_BLOCK(mp) + 1,

			xfs_ialloc_cluster_alignment(mp));

	*first = XFS_OFFBNO_TO_AGINO(mp, bno, 0);

	*first = XFS_AGB_TO_AGINO(mp, bno);



	/*

	 * Calculate the last inode, which will be at the end of the

	 * last (aligned) cluster that can be allocated in the AG.

	 */

	bno = round_down(eoag, xfs_ialloc_cluster_alignment(mp));

	*last = XFS_OFFBNO_TO_AGINO(mp, bno, 0) - 1;

	*last = XFS_AGB_TO_AGINO(mp, bno) - 1;

}



/*

fs/xfs/scrub/ialloc.c

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ xchk_iallocbt_check_freemask( 


	/* Make sure the freemask matches the inode records. */

	blks_per_cluster = xfs_icluster_size_fsb(mp);

	nr_inodes = XFS_OFFBNO_TO_AGINO(mp, blks_per_cluster, 0);

	nr_inodes = XFS_FSB_TO_INO(mp, blks_per_cluster);



	for (agino = irec->ir_startino;

	     agino < irec->ir_startino + XFS_INODES_PER_CHUNK;

fs/xfs/xfs_fsops.c

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ xfs_growfs_data( 
	if (mp->m_sb.sb_imax_pct) {

		uint64_t icount = mp->m_sb.sb_dblocks * mp->m_sb.sb_imax_pct;

		do_div(icount, 100);

		mp->m_maxicount = icount << mp->m_sb.sb_inopblog;

		mp->m_maxicount = XFS_FSB_TO_INO(mp, icount);

	} else

		mp->m_maxicount = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE