xfs: clean up xfs_btree_del_cursor callers

Source kernel commit: ef97ef26d263fb65f0c7446a10cf93201dc0388c

Less trivial cleanups of the error argument to xfs_btree_del_cursor;
these require some minor code refactoring.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Reviewed-by: Carlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/libxfs/xfs_refcount.c b/libxfs/xfs_refcount.c
index fabbacd46ca7d74d00b6c0216c3b6f52f878fbe4..8900d89e1b68b25c167161ec5e15ed794c03e307 100644 (file)
--- a/libxfs/xfs_refcount.c
+++ b/libxfs/xfs_refcount.c
@@ -1674,11 +1674,11 @@ xfs_refcount_recover_cow_leftovers(
        high.rc.rc_startblock = -1U;
        error = xfs_btree_query_range(cur, &low, &high,
                        xfs_refcount_recover_extent, &debris);
-       if (error)
-               goto out_cursor;
-       xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR);
+       xfs_btree_del_cursor(cur, error);
        xfs_trans_brelse(tp, agbp);
        xfs_trans_cancel(tp);
+       if (error)
+               goto out_free;
 
        /* Now iterate the list to free the leftovers */
        list_for_each_entry_safe(rr, n, &debris, rr_list) {
@@ -1726,11 +1726,6 @@ out_free:
                kmem_free(rr);
        }
        return error;
-
-out_cursor:
-       xfs_btree_del_cursor(cur, XFS_BTREE_ERROR);
-       xfs_trans_brelse(tp, agbp);
-       goto out_trans;
 }
 
 /* Is there a record covering a given extent? */