On Mon, Sep 17, 2018 at 10:53:48PM +0200, Christoph Hellwig wrote:
> Merge the two cases for reflink vs not into a single one.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
Looks ok to me,
Reviewed-by: Darrick J. Wong <darrick.wong@xxxxxxxxxx>
--D
> ---
> fs/xfs/xfs_iomap.c | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
> index 6320aca39f39..9595a3c59ade 100644
> --- a/fs/xfs/xfs_iomap.c
> +++ b/fs/xfs/xfs_iomap.c
> @@ -1048,16 +1048,20 @@ xfs_file_iomap_begin(
> if (!(flags & (IOMAP_WRITE | IOMAP_ZERO)))
> goto out_found;
>
> + /*
> + * Don't need to allocate over holes when doing zeroing operations,
> + * unless we need to COW and have an existing extent.
> + */
> + if ((flags & IOMAP_ZERO) &&
> + (!xfs_is_reflink_inode(ip) ||
> + !needs_cow_for_zeroing(&imap, nimaps)))
> + goto out_found;
> +
> /*
> * Break shared extents if necessary. Checks for non-blocking IO have
> * been done up front, so we don't need to do them here.
> */
> if (xfs_is_reflink_inode(ip)) {
> - /* if zeroing doesn't need COW allocation, then we are done. */
> - if ((flags & IOMAP_ZERO) &&
> - !needs_cow_for_zeroing(&imap, nimaps))
> - goto out_found;
> -
> if (flags & IOMAP_DIRECT) {
> /* may drop and re-acquire the ilock */
> error = xfs_reflink_allocate_cow(ip, &imap, &shared,
> @@ -1074,10 +1078,6 @@ xfs_file_iomap_begin(
> length = XFS_FSB_TO_B(mp, end_fsb) - offset;
> }
>
> - /* Don't need to allocate over holes when doing zeroing operations. */
> - if (flags & IOMAP_ZERO)
> - goto out_found;
> -
> if (!imap_needs_alloc(inode, &imap, nimaps))
> goto out_found;
>
> --
> 2.18.0
>
