xfs: use new extent lookup helpers in __xfs_reflink_reserve_cow

commit 2755fc4438501c8c28e7783df890e889f6772bee upstream.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c
index e65cd0a..7a30bff 100644 (file)
--- a/fs/xfs/xfs_reflink.c
+++ b/fs/xfs/xfs_reflink.c
@@ -243,10 +243,11 @@ xfs_reflink_reserve_cow(
        struct xfs_bmbt_irec    *imap,
        bool                    *shared)
 {
-       struct xfs_bmbt_irec    got, prev;
+       struct xfs_ifork        *ifp = XFS_IFORK_PTR(ip, XFS_COW_FORK);
+       struct xfs_bmbt_irec    got;
        xfs_fileoff_t           end_fsb, orig_end_fsb;
-       int                     eof = 0, error = 0;
-       bool                    trimmed;
+       int                     error = 0;
+       bool                    eof = false, trimmed;
        xfs_extnum_t            idx;
        xfs_extlen_t            align;
 
@@ -258,8 +259,9 @@ xfs_reflink_reserve_cow(
         * extent list is generally faster than going out to the shared extent
         * tree.
         */
-       xfs_bmap_search_extents(ip, imap->br_startoff, XFS_COW_FORK, &eof, &idx,
-                       &got, &prev);
+
+       if (!xfs_iext_lookup_extent(ip, ifp, imap->br_startoff, &idx, &got))
+               eof = true;
        if (!eof && got.br_startoff <= imap->br_startoff) {
                trace_xfs_reflink_cow_found(ip, imap);
                xfs_trim_extent(imap, got.br_startoff, got.br_blockcount);