Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fca8c805 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: remove xfs_reflink_trim_irec_to_next_cow 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent a7b28f72

fs/xfs/xfs_aops.c

+0 −7
Original line number Diff line number Diff line
@@ -404,13 +404,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)

fs/xfs/xfs_reflink.c

+0 −33
Original line number Diff line number Diff line
@@ -500,39 +500,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.

 *

fs/xfs/xfs_reflink.h

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,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,

fs/xfs/xfs_trace.h

+0 −1
Original line number Diff line number Diff line
@@ -3216,7 +3216,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);