On Mon, Nov 14, 2016 at 06:12:42PM +0100, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@xxxxxx>
> ---
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> fs/xfs/xfs_reflink.c | 12 ++++--------
> 1 file changed, 4 insertions(+), 8 deletions(-)
>
> diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
> index 0668490..a878d42 100644
> --- a/fs/xfs/xfs_reflink.c
> +++ b/fs/xfs/xfs_reflink.c
> @@ -493,18 +493,15 @@ xfs_reflink_cancel_cow_blocks(
> xfs_fileoff_t end_fsb)
> {
> struct xfs_ifork *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
> - struct xfs_bmbt_irec got, prev, del;
> + struct xfs_bmbt_irec got, del;
> xfs_extnum_t idx;
> xfs_fsblock_t firstfsb;
> struct xfs_defer_ops dfops;
> - int error = 0, eof = 0;
> + int error = 0;
>
> if (!xfs_is_reflink_inode(ip))
> return 0;
> -
> - xfs_bmap_search_extents(ip, offset_fsb, XFS_COW_FORK, &eof, &idx,
> - &got, &prev);
> - if (eof)
> + if (!xfs_iext_lookup_extent(ip, ifp, offset_fsb, &idx, &got))
> return 0;
>
> while (got.br_startoff < end_fsb) {
> @@ -547,9 +544,8 @@ xfs_reflink_cancel_cow_blocks(
> xfs_bmap_del_extent_cow(ip, &idx, &got, &del);
> }
>
> - if (++idx >= xfs_iext_count(ifp))
> + if (!xfs_iext_get_extent(ifp, ++idx, &got))
> break;
> - xfs_bmbt_get_all(xfs_iext_get_ext(ifp, idx), &got);
> }
>
> /* clear tag if cow fork is emptied */
> --
> 2.1.4
>
> --
> 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
--
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
