On Fri, Oct 25, 2019 at 05:03:35PM +0200, Christoph Hellwig wrote:
> Move the extent zeroing case there for the XFS_BMAPI_ZERO flag outside
> the low-level allocator and into xfs_bmapi_allocate, where is still
> is in transaction context, but outside the very lowlevel code where
> it doesn't belong.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Looks ok,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/libxfs/xfs_alloc.c | 7 -------
> fs/xfs/libxfs/xfs_alloc.h | 4 +---
> fs/xfs/libxfs/xfs_bmap.c | 10 ++++++----
> fs/xfs/xfs_bmap_util.c | 7 -------
> 4 files changed, 7 insertions(+), 21 deletions(-)
>
> diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c
> index 925eba9489d5..ff6454887ff3 100644
> --- a/fs/xfs/libxfs/xfs_alloc.c
> +++ b/fs/xfs/libxfs/xfs_alloc.c
> @@ -3083,13 +3083,6 @@ xfs_alloc_vextent(
> args->len);
> #endif
>
> - /* Zero the extent if we were asked to do so */
> - if (args->datatype & XFS_ALLOC_USERDATA_ZERO) {
> - error = xfs_zero_extent(args->ip, args->fsbno, args->len);
> - if (error)
> - goto error0;
> - }
> -
> }
> xfs_perag_put(args->pag);
> return 0;
> diff --git a/fs/xfs/libxfs/xfs_alloc.h b/fs/xfs/libxfs/xfs_alloc.h
> index d6ed5d2c07c2..626384d75c9c 100644
> --- a/fs/xfs/libxfs/xfs_alloc.h
> +++ b/fs/xfs/libxfs/xfs_alloc.h
> @@ -54,7 +54,6 @@ typedef struct xfs_alloc_arg {
> struct xfs_mount *mp; /* file system mount point */
> struct xfs_buf *agbp; /* buffer for a.g. freelist header */
> struct xfs_perag *pag; /* per-ag struct for this agno */
> - struct xfs_inode *ip; /* for userdata zeroing method */
> xfs_fsblock_t fsbno; /* file system block number */
> xfs_agnumber_t agno; /* allocation group number */
> xfs_agblock_t agbno; /* allocation group-relative block # */
> @@ -83,8 +82,7 @@ typedef struct xfs_alloc_arg {
> */
> #define XFS_ALLOC_USERDATA (1 << 0)/* allocation is for user data*/
> #define XFS_ALLOC_INITIAL_USER_DATA (1 << 1)/* special case start of file */
> -#define XFS_ALLOC_USERDATA_ZERO (1 << 2)/* zero extent on allocation */
> -#define XFS_ALLOC_NOBUSY (1 << 3)/* Busy extents not allowed */
> +#define XFS_ALLOC_NOBUSY (1 << 2)/* Busy extents not allowed */
>
> static inline bool
> xfs_alloc_is_userdata(int datatype)
> diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c
> index c278eff29e82..6ec3c48abc1b 100644
> --- a/fs/xfs/libxfs/xfs_bmap.c
> +++ b/fs/xfs/libxfs/xfs_bmap.c
> @@ -3555,8 +3555,6 @@ xfs_bmap_btalloc(
> args.wasdel = ap->wasdel;
> args.resv = XFS_AG_RESV_NONE;
> args.datatype = ap->datatype;
> - if (ap->datatype & XFS_ALLOC_USERDATA_ZERO)
> - args.ip = ap->ip;
>
> error = xfs_alloc_vextent(&args);
> if (error)
> @@ -4011,8 +4009,6 @@ xfs_bmap_alloc_userdata(
> * the busy list.
> */
> bma->datatype = XFS_ALLOC_NOBUSY;
> - if (bma->flags & XFS_BMAPI_ZERO)
> - bma->datatype |= XFS_ALLOC_USERDATA_ZERO;
> if (whichfork == XFS_DATA_FORK) {
> if (bma->offset == 0)
> bma->datatype |= XFS_ALLOC_INITIAL_USER_DATA;
> @@ -4071,6 +4067,12 @@ xfs_bmapi_allocate(
> if (error || bma->blkno == NULLFSBLOCK)
> return error;
>
> + if (bma->flags & XFS_BMAPI_ZERO) {
> + error = xfs_zero_extent(bma->ip, bma->blkno, bma->length);
> + if (error)
> + return error;
> + }
> +
> if ((ifp->if_flags & XFS_IFBROOT) && !bma->cur)
> bma->cur = xfs_bmbt_init_cursor(mp, bma->tp, bma->ip, whichfork);
> /*
> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c
> index 44d6b6469303..e418f9922bb1 100644
> --- a/fs/xfs/xfs_bmap_util.c
> +++ b/fs/xfs/xfs_bmap_util.c
> @@ -165,13 +165,6 @@ xfs_bmap_rtalloc(
> xfs_trans_mod_dquot_byino(ap->tp, ap->ip,
> ap->wasdel ? XFS_TRANS_DQ_DELRTBCOUNT :
> XFS_TRANS_DQ_RTBCOUNT, (long) ralen);
> -
> - /* Zero the extent if we were asked to do so */
> - if (ap->datatype & XFS_ALLOC_USERDATA_ZERO) {
> - error = xfs_zero_extent(ap->ip, ap->blkno, ap->length);
> - if (error)
> - return error;
> - }
> } else {
> ap->length = 0;
> }
> --
> 2.20.1
>
