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

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

xfs: iterate backwards in xfs_reflink_cancel_cow_blocks 



Match the iteration order for extent deletion in the truncate and
reflink I/O completion path.

This also happens to make implementing the new incore extent list
a lot easier.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
parent b2b1712a

fs/xfs/xfs_reflink.c

+12 −4
Original line number Diff line number Diff line
@@ -569,12 +569,20 @@ xfs_reflink_cancel_cow_blocks( 


	if (!xfs_is_reflink_inode(ip))

		return 0;

	if (!xfs_iext_lookup_extent(ip, ifp, offset_fsb, &icur, &got))

	if (!xfs_iext_lookup_extent_before(ip, ifp, &end_fsb, &icur, &got))

		return 0;



	while (got.br_startoff < end_fsb) {

	/* Walk backwards until we're out of the I/O range... */

	while (got.br_startoff + got.br_blockcount > offset_fsb) {

		del = got;

		xfs_trim_extent(&del, offset_fsb, end_fsb - offset_fsb);



		/* Extent delete may have bumped ext forward */

		if (!del.br_blockcount) {

			xfs_iext_prev(ifp, &icur);

			goto next_extent;

		}



		trace_xfs_reflink_cancel_cow(ip, &del);



		if (isnullstartblock(del.br_startblock)) {
@@ -612,8 +620,8 @@ xfs_reflink_cancel_cow_blocks( 
			/* Remove the mapping from the CoW fork. */

			xfs_bmap_del_extent_cow(ip, &icur, &got, &del);

		}



		if (!xfs_iext_next_extent(ifp, &icur, &got))

next_extent:

		if (!xfs_iext_get_extent(ifp, &icur, &got))

			break;

	}