Update bcachefs sources to 90a9c61e2b bcachefs: Switch bch2_btree_delete_range()...

[bcachefs-tools-debian] / libbcachefs / reflink.c

diff --git a/libbcachefs/reflink.c b/libbcachefs/reflink.c
index 2038e3502d8c1434ea99102a101b6278ce2d6f0d..d5c14bb2992d5d7fc4281a207140861a0cdefd1f 100644 (file)
--- a/libbcachefs/reflink.c
+++ b/libbcachefs/reflink.c
@@ -299,7 +299,8 @@ s64 bch2_remap_range(struct bch_fs *c,
        bch2_trans_iter_init(&trans, &dst_iter, BTREE_ID_extents, dst_start,
                             BTREE_ITER_INTENT);
 
-       while ((ret == 0 || ret == -EINTR) &&
+       while ((ret == 0 ||
+               bch2_err_matches(ret, BCH_ERR_transaction_restart)) &&
               bkey_cmp(dst_iter.pos, dst_end) < 0) {
                struct disk_reservation disk_res = { 0 };
 
@@ -409,7 +410,7 @@ s64 bch2_remap_range(struct bch_fs *c,
                }
 
                bch2_trans_iter_exit(&trans, &inode_iter);
-       } while (ret2 == -EINTR);
+       } while (bch2_err_matches(ret2, BCH_ERR_transaction_restart));
 
        bch2_trans_exit(&trans);
        bch2_bkey_buf_exit(&new_src, c);