On Wed, Apr 18, 2018 at 09:31:14AM -0400, Brian Foster wrote:
> Refactor the AGFL block free code into a new helper such that it can
> be invoked from deferred context. No functional changes.
>
> Signed-off-by: Brian Foster <bfoster@xxxxxxxxxx>
> Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>
> Reviewed-by: Christoph Hellwig <hch@xxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/libxfs/xfs_alloc.c | 37 +++++++++++++++++++++++++++----------
> fs/xfs/libxfs/xfs_alloc.h | 2 ++
> 2 files changed, 29 insertions(+), 10 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
> index 4bcc095fe44a..193a5b4909c5 100644
> --- a/fs/xfs/libxfs/xfs_alloc.c
> +++ b/fs/xfs/libxfs/xfs_alloc.c
> @@ -2060,6 +2060,30 @@ xfs_alloc_space_available(
> return true;
> }
>
> +int
> +xfs_free_agfl_block(
> + struct xfs_trans *tp,
> + xfs_agnumber_t agno,
> + xfs_agblock_t agbno,
> + struct xfs_buf *agbp,
> + struct xfs_owner_info *oinfo)
> +{
> + int error;
> + struct xfs_buf *bp;
> +
> + error = xfs_free_ag_extent(tp, agbp, agno, agbno, 1, oinfo,
> + XFS_AG_RESV_AGFL);
> + if (error)
> + return error;
> +
> + bp = xfs_btree_get_bufs(tp->t_mountp, tp, agno, agbno, 0);
> + if (!bp)
> + return -EFSCORRUPTED;
> + xfs_trans_binval(tp, bp);
> +
> + return 0;
> +}
> +
> /*
> * Check the agfl fields of the agf for inconsistency or corruption. The purpose
> * is to detect an agfl header padding mismatch between current and early v5
> @@ -2247,21 +2271,14 @@ xfs_alloc_fix_freelist(
> else
> xfs_rmap_ag_owner(&targs.oinfo, XFS_RMAP_OWN_AG);
> while (!(flags & XFS_ALLOC_FLAG_NOSHRINK) && pag->pagf_flcount > need) {
> - struct xfs_buf *bp;
> -
> error = xfs_alloc_get_freelist(tp, agbp, &bno, 0);
> if (error)
> goto out_agbp_relse;
> - error = xfs_free_ag_extent(tp, agbp, args->agno, bno, 1,
> - &targs.oinfo, XFS_AG_RESV_AGFL);
> +
> + error = xfs_free_agfl_block(tp, args->agno, bno, agbp,
> + &targs.oinfo);
> if (error)
> goto out_agbp_relse;
> - bp = xfs_btree_get_bufs(mp, tp, args->agno, bno, 0);
> - if (!bp) {
> - error = -EFSCORRUPTED;
> - goto out_agbp_relse;
> - }
> - xfs_trans_binval(tp, bp);
> }
>
> targs.tp = tp;
> diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h
> index cbf789ea5a4e..949e21326066 100644
> --- a/fs/xfs/libxfs/xfs_alloc.h
> +++ b/fs/xfs/libxfs/xfs_alloc.h
> @@ -223,6 +223,8 @@ int xfs_read_agf(struct xfs_mount *mp, struct xfs_trans *tp,
> xfs_agnumber_t agno, int flags, struct xfs_buf **bpp);
> int xfs_alloc_read_agfl(struct xfs_mount *mp, struct xfs_trans *tp,
> xfs_agnumber_t agno, struct xfs_buf **bpp);
> +int xfs_free_agfl_block(struct xfs_trans *, xfs_agnumber_t, xfs_agblock_t,
> + struct xfs_buf *, struct xfs_owner_info *);
> int xfs_alloc_fix_freelist(struct xfs_alloc_arg *args, int flags);
> int xfs_free_extent_fix_freelist(struct xfs_trans *tp, xfs_agnumber_t agno,
> struct xfs_buf **agbp);
> --
> 2.13.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-xfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
