Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd6c5da3 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Greg Kroah-Hartman
Browse files

xfs: refactor agfl length computation function 



commit 1cac233cfe71f21e069705a4930c18e48d897be6 upstream.

Refactor xfs_alloc_min_freelist to accept a NULL @pag argument, in which
case it returns the largest possible minimum length.  This will be used
in an upcoming patch to compute the length of the AGFL at mkfs time.

Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6363fdf7

fs/xfs/libxfs/xfs_alloc.c

+13 −5
Original line number Diff line number Diff line
@@ -1998,23 +1998,31 @@ xfs_alloc_longest_free_extent( 
	return pag->pagf_flcount > 0 || pag->pagf_longest > 0;

}



/*

 * Compute the minimum length of the AGFL in the given AG.  If @pag is NULL,

 * return the largest possible minimum length.

 */

unsigned int

xfs_alloc_min_freelist(

	struct xfs_mount	*mp,

	struct xfs_perag	*pag)

{

	/* AG btrees have at least 1 level. */

	static const uint8_t	fake_levels[XFS_BTNUM_AGF] = {1, 1, 1};

	const uint8_t		*levels = pag ? pag->pagf_levels : fake_levels;

	unsigned int		min_free;



	ASSERT(mp->m_ag_maxlevels > 0);



	/* space needed by-bno freespace btree */

	min_free = min_t(unsigned int, pag->pagf_levels[XFS_BTNUM_BNOi] + 1,

	min_free = min_t(unsigned int, levels[XFS_BTNUM_BNOi] + 1,

				       mp->m_ag_maxlevels);

	/* space needed by-size freespace btree */

	min_free += min_t(unsigned int, pag->pagf_levels[XFS_BTNUM_CNTi] + 1,

	min_free += min_t(unsigned int, levels[XFS_BTNUM_CNTi] + 1,

				       mp->m_ag_maxlevels);

	/* space needed reverse mapping used space btree */

	if (xfs_sb_version_hasrmapbt(&mp->m_sb))

		min_free += min_t(unsigned int,

				  pag->pagf_levels[XFS_BTNUM_RMAPi] + 1,

		min_free += min_t(unsigned int, levels[XFS_BTNUM_RMAPi] + 1,

						mp->m_rmap_maxlevels);



	return min_free;