Update bcachefs sources to b964c6cba8 bcachefs: Change lockrestart_do() to always...

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

diff --git a/libbcachefs/fsck.c b/libbcachefs/fsck.c
index bedfd34803ce816c80c2eee62c2fcd5696956422..36eba46d566e351c1b50dec637bc02f1ff2a7e17 100644 (file)
--- a/libbcachefs/fsck.c
+++ b/libbcachefs/fsck.c
@@ -727,7 +727,7 @@ static int check_dirent(struct btree_trans *trans, struct btree_iter *iter,
 
        k = bch2_btree_iter_peek(iter);
        if (!k.k)
-               return 1;
+               return 0;
 
        ret = bkey_err(k);
        if (ret)
@@ -803,8 +803,7 @@ static int check_dirent(struct btree_trans *trans, struct btree_iter *iter,
                ret = __write_inode(trans, &target, target_snapshot) ?:
                        bch2_trans_commit(trans, NULL, NULL,
                                          BTREE_INSERT_NOFAIL|
-                                         BTREE_INSERT_LAZY_RW|
-                                         BTREE_INSERT_NOUNLOCK);
+                                         BTREE_INSERT_LAZY_RW);
                if (ret)
                        return ret;
                return -EINTR;
@@ -904,19 +903,12 @@ static int check_dirents(struct bch_fs *c)
                                   BTREE_ITER_INTENT|
                                   BTREE_ITER_PREFETCH);
 
-       while (1) {
+       do {
                ret = lockrestart_do(&trans,
                                check_dirent(&trans, iter, &hash_info, &w, &nr_subdirs));
-               if (ret == 1) {
-                       /* at end */
-                       ret = 0;
-                       break;
-               }
                if (ret)
                        break;
-
-               bch2_btree_iter_advance(iter);
-       }
+       } while (bch2_btree_iter_advance(iter));
        bch2_trans_iter_put(&trans, iter);
 
        return bch2_trans_exit(&trans) ?: ret;