On Mon, Sep 16, 2019 at 08:16:34AM -0400, Brian Foster wrote:
> Lift the btree fixup path into a helper function.
>
> Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/libxfs/xfs_alloc.c | 42 +++++++++++++++++++++++++++++----------
> fs/xfs/xfs_trace.h | 1 +
> 2 files changed, 33 insertions(+), 10 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
> index 6f7e4666250c..381a08257aaf 100644
> --- a/fs/xfs/libxfs/xfs_alloc.c
> +++ b/fs/xfs/libxfs/xfs_alloc.c
> @@ -883,6 +883,36 @@ xfs_alloc_cur_check(
> return 0;
> }
>
> +/*
> + * Complete an allocation of a candidate extent. Remove the extent from both
> + * trees and update the args structure.
> + */
> +STATIC int
> +xfs_alloc_cur_finish(
> + struct xfs_alloc_arg *args,
> + struct xfs_alloc_cur *acur)
> +{
> + int error;
> +
> + ASSERT(acur->cnt && acur->bnolt);
> + ASSERT(acur->bno >= acur->rec_bno);
> + ASSERT(acur->bno + acur->len <= acur->rec_bno + acur->rec_len);
> + ASSERT(acur->rec_bno + acur->rec_len <=
> + be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
> +
> + error = xfs_alloc_fixup_trees(acur->cnt, acur->bnolt, acur->rec_bno,
> + acur->rec_len, acur->bno, acur->len, 0);
> + if (error)
> + return error;
> +
> + args->agbno = acur->bno;
> + args->len = acur->len;
> + args->wasfromfl = 0;
> +
> + trace_xfs_alloc_cur(args);
> + return 0;
> +}
> +
> /*
> * Deal with the case where only small freespaces remain. Either return the
> * contents of the last freespace record, or allocate space from the freelist if
> @@ -1352,7 +1382,6 @@ xfs_alloc_ag_vextent_near(
> } else if (error) {
> goto out;
> }
> - args->wasfromfl = 0;
>
> /*
> * First algorithm.
> @@ -1433,15 +1462,8 @@ xfs_alloc_ag_vextent_near(
> }
>
> alloc:
> - args->agbno = acur.bno;
> - args->len = acur.len;
> - ASSERT(acur.bno >= acur.rec_bno);
> - ASSERT(acur.bno + acur.len <= acur.rec_bno + acur.rec_len);
> - ASSERT(acur.rec_bno + acur.rec_len <=
> - be32_to_cpu(XFS_BUF_TO_AGF(args->agbp)->agf_length));
> -
> - error = xfs_alloc_fixup_trees(acur.cnt, acur.bnolt, acur.rec_bno,
> - acur.rec_len, acur.bno, acur.len, 0);
> + /* fix up btrees on a successful allocation */
> + error = xfs_alloc_cur_finish(args, &acur);
>
> out:
> xfs_alloc_cur_close(&acur, error);
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index 2e57dc3d4230..b8b93068efe7 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -1642,6 +1642,7 @@ DEFINE_ALLOC_EVENT(xfs_alloc_exact_notfound);
> DEFINE_ALLOC_EVENT(xfs_alloc_exact_error);
> DEFINE_ALLOC_EVENT(xfs_alloc_near_nominleft);
> DEFINE_ALLOC_EVENT(xfs_alloc_near_first);
> +DEFINE_ALLOC_EVENT(xfs_alloc_cur);
> DEFINE_ALLOC_EVENT(xfs_alloc_cur_right);
> DEFINE_ALLOC_EVENT(xfs_alloc_cur_left);
> DEFINE_ALLOC_EVENT(xfs_alloc_near_error);
> --
> 2.20.1
>
