On Thu, May 31, 2018 at 08:07:47PM +0200, Christoph Hellwig wrote:
> We already have to check for overlapping COW extents everytime we
> come back to a page in xfs_writepage_map / xfs_map_cow, so this
> additional trim is not required.
>
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/xfs_aops.c | 7 -------
> fs/xfs/xfs_reflink.c | 33 ---------------------------------
> fs/xfs/xfs_reflink.h | 2 --
> fs/xfs/xfs_trace.h | 1 -
> 4 files changed, 43 deletions(-)
>
> diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
> index 2966d62b0594..9b5a4b6e268c 100644
> --- a/fs/xfs/xfs_aops.c
> +++ b/fs/xfs/xfs_aops.c
> @@ -416,13 +416,6 @@ xfs_map_blocks(
> offset_fsb = XFS_B_TO_FSBT(mp, offset);
> error = xfs_bmapi_read(ip, offset_fsb, end_fsb - offset_fsb,
> imap, &nimaps, XFS_BMAPI_ENTIRE);
> - /*
> - * Truncate an overwrite extent if there's a pending CoW
> - * reservation before the end of this extent. This forces us
> - * to come back to writepage to take care of the CoW.
> - */
> - if (nimaps && type == XFS_IO_OVERWRITE)
> - xfs_reflink_trim_irec_to_next_cow(ip, offset_fsb, imap);
> xfs_iunlock(ip, XFS_ILOCK_SHARED);
>
> if (error)
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index 713e857d9ffa..d0092c864458 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -514,39 +514,6 @@ xfs_reflink_find_cow_mapping(
> return true;
> }
>
> -/*
> - * Trim an extent to end at the next CoW reservation past offset_fsb.
> - */
> -void
> -xfs_reflink_trim_irec_to_next_cow(
> - struct xfs_inode *ip,
> - xfs_fileoff_t offset_fsb,
> - struct xfs_bmbt_irec *imap)
> -{
> - struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
> - struct xfs_bmbt_irec got;
> - struct xfs_iext_cursor icur;
> -
> - if (!xfs_is_reflink_inode(ip))
> - return;
> -
> - /* Find the extent in the CoW fork. */
> - if (!xfs_iext_lookup_extent(ip, ifp, offset_fsb, &icur, &got))
> - return;
> -
> - /* This is the extent before; try sliding up one. */
> - if (got.br_startoff < offset_fsb) {
> - if (!xfs_iext_next_extent(ifp, &icur, &got))
> - return;
> - }
> -
> - if (got.br_startoff >= imap->br_startoff + imap->br_blockcount)
> - return;
> -
> - imap->br_blockcount = got.br_startoff - imap->br_startoff;
> - trace_xfs_reflink_trim_irec(ip, imap);
> -}
> -
> /*
> * Cancel CoW reservations for some block range of an inode.
> *
> diff --git a/fs/xfs/xfs_reflink.h b/fs/xfs/xfs_reflink.h
> index 701487bab468..c0a25609007b 100644
> --- a/fs/xfs/xfs_reflink.h
> +++ b/fs/xfs/xfs_reflink.h
> @@ -34,8 +34,6 @@ extern int xfs_reflink_convert_cow(struct xfs_inode *ip, xfs_off_t offset,
> xfs_off_t count);
> extern bool xfs_reflink_find_cow_mapping(struct xfs_inode *ip, xfs_off_t offset,
> struct xfs_bmbt_irec *imap);
> -extern void xfs_reflink_trim_irec_to_next_cow(struct xfs_inode *ip,
> - xfs_fileoff_t offset_fsb, struct xfs_bmbt_irec *imap);
>
> extern int xfs_reflink_cancel_cow_blocks(struct xfs_inode *ip,
> struct xfs_trans **tpp, xfs_fileoff_t offset_fsb,
> diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h
> index 9d4c4ca24fe6..041045a8d65c 100644
> --- a/fs/xfs/xfs_trace.h
> +++ b/fs/xfs/xfs_trace.h
> @@ -3228,7 +3228,6 @@ DEFINE_RW_EVENT(xfs_reflink_reserve_cow);
>
> DEFINE_SIMPLE_IO_EVENT(xfs_reflink_bounce_dio_write);
> DEFINE_IOMAP_EVENT(xfs_reflink_find_cow_mapping);
> -DEFINE_INODE_IREC_EVENT(xfs_reflink_trim_irec);
>
> DEFINE_SIMPLE_IO_EVENT(xfs_reflink_cancel_cow_range);
> DEFINE_SIMPLE_IO_EVENT(xfs_reflink_end_cow);
> --
> 2.17.0
>
> --
> 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
