2 files changed, 3 insertions, 2 deletions

diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c
index 66efc702452a..0b29918291ff 100644
--- a/fs/xfs/libxfs/xfs_ialloc.c
+++ b/fs/xfs/libxfs/xfs_ialloc.c
@@ -2232,7 +2232,7 @@ xfs_imap_lookup(
         }
 
         xfs_trans_brelse(tp, agbp);
-        xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR);
+        xfs_btree_del_cursor(cur, error ? XFS_BTREE_ERROR : XFS_BTREE_NOERROR);
         if (error)
                 return error;
 
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c
index f41b0c3fddab..930ebd86beba 100644
--- a/fs/xfs/xfs_itable.c
+++ b/fs/xfs/xfs_itable.c
@@ -473,7 +473,8 @@ xfs_bulkstat(
                  * pending error, then we are done.
                  */
 del_cursor:
-                xfs_btree_del_cursor(cur, XFS_BTREE_NOERROR);
+                xfs_btree_del_cursor(cur, error ?
+                                          XFS_BTREE_ERROR : XFS_BTREE_NOERROR);
                 xfs_buf_relse(agbp);
                 if (error)
                         break;