xfs_alloc_min_freelist is used to determine the minimum size for the
AGFL based upon the current height of the bnobt, cnobt, and rmapbt.
In order to determine how much space needs to be in the AGFL reserve in
order to permit a transacation that may perform multiple allocations, it
is necessary to also know the minimum size of the AGFL after trees are
split and the level has incremented.
Let xfs_alloc_min_freelist take an increment so that callers may request
the minimum AGFL size based upon current + N.
This patch has no functional change. A subsequent patch will bring new
users.
Signed-off-by: Krister Johansen <kjlx@xxxxxxxxxxxxxxxxxx>
---
fs/xfs/libxfs/xfs_alloc.c | 21 +++++++++++++--------
fs/xfs/libxfs/xfs_alloc.h | 2 +-
fs/xfs/libxfs/xfs_bmap.c | 2 +-
fs/xfs/libxfs/xfs_ialloc.c | 2 +-
4 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
index d70d027a8178..0b15414468cf 100644
--- a/fs/xfs/libxfs/xfs_alloc.c
+++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -2325,17 +2325,22 @@ xfs_alloc_longest_free_extent(
/*
* Compute the minimum length of the AGFL in the given AG. If @pag is NULL,
- * return the largest possible minimum length.
+ * return the largest possible minimum length. If @level_inc is greater than
+ * zero, increment the level being computed by cur + level_inc.
*/
unsigned int
xfs_alloc_min_freelist(
struct xfs_mount *mp,
- struct xfs_perag *pag)
+ struct xfs_perag *pag,
+ unsigned int level_inc)
{
/* AG btrees have at least 1 level. */
- const unsigned int bno_level = pag ? pag->pagf_bno_level : 1;
- const unsigned int cnt_level = pag ? pag->pagf_cnt_level : 1;
- const unsigned int rmap_level = pag ? pag->pagf_rmap_level : 1;
+ const unsigned int bno_level =
+ pag ? pag->pagf_bno_level + level_inc : 1;
+ const unsigned int cnt_level =
+ pag ? pag->pagf_cnt_level + level_inc : 1;
+ const unsigned int rmap_level =
+ pag ? pag->pagf_rmap_level + level_inc : 1;
unsigned int min_free;
ASSERT(mp->m_alloc_maxlevels > 0);
@@ -2803,7 +2808,7 @@ xfs_alloc_agfl_calc_reserves(
return error;
agf = agbp->b_addr;
- agfl_blocks = xfs_alloc_min_freelist(mp, NULL);
+ agfl_blocks = xfs_alloc_min_freelist(mp, NULL, 0);
list_len = be32_to_cpu(agf->agf_flcount);
xfs_trans_brelse(tp, agbp);
@@ -2861,7 +2866,7 @@ xfs_alloc_fix_freelist(
goto out_agbp_relse;
}
- need = xfs_alloc_min_freelist(mp, pag);
+ need = xfs_alloc_min_freelist(mp, pag, 0);
if (!xfs_alloc_space_available(args, need, alloc_flags |
XFS_ALLOC_FLAG_CHECK))
goto out_agbp_relse;
@@ -2885,7 +2890,7 @@ xfs_alloc_fix_freelist(
xfs_agfl_reset(tp, agbp, pag);
/* If there isn't enough total space or single-extent, reject it. */
- need = xfs_alloc_min_freelist(mp, pag);
+ need = xfs_alloc_min_freelist(mp, pag, 0);
if (!xfs_alloc_space_available(args, need, alloc_flags))
goto out_agbp_relse;
diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h
index 8cbdfb62ac14..77347d69f797 100644
--- a/fs/xfs/libxfs/xfs_alloc.h
+++ b/fs/xfs/libxfs/xfs_alloc.h
@@ -74,7 +74,7 @@ unsigned int xfs_alloc_ag_max_usable(struct xfs_mount *mp);
xfs_extlen_t xfs_alloc_longest_free_extent(struct xfs_perag *pag,
xfs_extlen_t need, xfs_extlen_t reserved);
unsigned int xfs_alloc_min_freelist(struct xfs_mount *mp,
- struct xfs_perag *pag);
+ struct xfs_perag *pag, unsigned int level_inc);
int xfs_alloc_get_freelist(struct xfs_perag *pag, struct xfs_trans *tp,
struct xfs_buf *agfbp, xfs_agblock_t *bnop, int btreeblk);
int xfs_alloc_put_freelist(struct xfs_perag *pag, struct xfs_trans *tp,
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
index c101cf266bc4..742ec4142fb0 100644
--- a/fs/xfs/libxfs/xfs_bmap.c
+++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -3270,7 +3270,7 @@ xfs_bmap_longest_free_extent(
}
longest = xfs_alloc_longest_free_extent(pag,
- xfs_alloc_min_freelist(pag->pag_mount, pag),
+ xfs_alloc_min_freelist(pag->pag_mount, pag, 0),
xfs_ag_resv_needed(pag, XFS_AG_RESV_NONE));
if (*blen < longest)
*blen = longest;
diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
index 14c81f227c5b..30690b7965af 100644
--- a/fs/xfs/libxfs/xfs_ialloc.c
+++ b/fs/xfs/libxfs/xfs_ialloc.c
@@ -3047,7 +3047,7 @@ xfs_ialloc_calc_rootino(
first_bno += 1;
/* ...the initial AGFL... */
- first_bno += xfs_alloc_min_freelist(mp, NULL);
+ first_bno += xfs_alloc_min_freelist(mp, NULL, 0);
/* ...the free inode btree root... */
if (xfs_has_finobt(mp))
--
2.25.1
