1 files changed, 19 insertions, 12 deletions

diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c
index d6fd25f1db1f..6ccea09243ab 100644
--- a/fs/bcachefs/fsck.c
+++ b/fs/bcachefs/fsck.c
@@ -923,9 +923,10 @@ lookup_inode_for_snapshot(struct btree_trans *trans, struct inode_walker *w, str
 			bkey_init(&whiteout.k);
 			whiteout.k.type = KEY_TYPE_whiteout;
 			whiteout.k.p = SPOS(0, i->inode.bi_inum, k.k->p.snapshot);
-			ret = bch2_btree_insert_nonextent(trans, BTREE_ID_inodes,
-							  &whiteout,
-							  BTREE_UPDATE_internal_snapshot_node);
+			ret = bch2_btree_insert_trans(trans, BTREE_ID_inodes,
+						      &whiteout,
+						      BTREE_ITER_cached|
+						      BTREE_UPDATE_internal_snapshot_node);
 		}
 
 		if (ret)
@@ -2121,6 +2122,7 @@ static int check_dirent_to_subvol(struct btree_trans *trans, struct btree_iter *
 				  struct bkey_s_c_dirent d)
 {
 	struct bch_fs *c = trans->c;
+	struct btree_iter subvol_iter = {};
 	struct bch_inode_unpacked subvol_root;
 	u32 parent_subvol = le32_to_cpu(d.v->d_parent_subvol);
 	u32 target_subvol = le32_to_cpu(d.v->d_child_subvol);
@@ -2177,18 +2179,19 @@ static int check_dirent_to_subvol(struct btree_trans *trans, struct btree_iter *
 		new_dirent->v.d_parent_subvol = cpu_to_le32(new_parent_subvol);
 	}
 
-	CLASS(btree_iter, subvol_iter)(trans, BTREE_ID_subvolumes, POS(0, target_subvol), 0);
+	bch2_trans_iter_init(trans, &subvol_iter, BTREE_ID_subvolumes, POS(0, target_subvol), 0);
 	struct bkey_s_c_subvolume s = bch2_bkey_get_typed(&subvol_iter, subvolume);
 	ret = bkey_err(s.s_c);
 	if (ret && !bch2_err_matches(ret, ENOENT))
-		return ret;
+		goto err;
 
 	if (ret) {
 		if (fsck_err(trans, dirent_to_missing_subvol,
 			     "dirent points to missing subvolume\n%s",
 			     (bch2_bkey_val_to_text(&buf, c, d.s_c), buf.buf)))
 			return bch2_fsck_remove_dirent(trans, d.k->p);
-		return 0;
+		ret = 0;
+		goto out;
 	}
 
 	if (le32_to_cpu(s.v->fs_path_parent) != parent_subvol) {
@@ -2200,7 +2203,7 @@ static int check_dirent_to_subvol(struct btree_trans *trans, struct btree_iter *
 		ret = bch2_inum_to_path(trans, (subvol_inum) { s.k->p.offset,
 					le64_to_cpu(s.v->inode) }, &buf);
 		if (ret)
-			return ret;
+			goto err;
 		prt_newline(&buf);
 		bch2_bkey_val_to_text(&buf, c, s.s_c);
 
@@ -2209,7 +2212,7 @@ static int check_dirent_to_subvol(struct btree_trans *trans, struct btree_iter *
 				bch2_bkey_make_mut_typed(trans, &subvol_iter, &s.s_c, 0, subvolume);
 			ret = PTR_ERR_OR_ZERO(n);
 			if (ret)
-				return ret;
+				goto err;
 
 			n->v.fs_path_parent = cpu_to_le32(parent_subvol);
 		}
@@ -2221,11 +2224,12 @@ static int check_dirent_to_subvol(struct btree_trans *trans, struct btree_iter *
 	ret = bch2_inode_find_by_inum_snapshot(trans, target_inum, target_snapshot,
 					       &subvol_root, 0);
 	if (ret && !bch2_err_matches(ret, ENOENT))
-		return ret;
+		goto err;
 
 	if (ret) {
 		bch_err(c, "subvol %u points to missing inode root %llu", target_subvol, target_inum);
-		return bch_err_throw(c, fsck_repair_unimplemented);
+		ret = bch_err_throw(c, fsck_repair_unimplemented);
+		goto err;
 	}
 
 	if (fsck_err_on(!ret && parent_subvol != subvol_root.bi_parent_subvol,
@@ -2237,13 +2241,16 @@ static int check_dirent_to_subvol(struct btree_trans *trans, struct btree_iter *
 		subvol_root.bi_snapshot = le32_to_cpu(s.v->snapshot);
 		ret = __bch2_fsck_write_inode(trans, &subvol_root);
 		if (ret)
-			return ret;
+			goto err;
 	}
 
 	ret = bch2_check_dirent_target(trans, iter, d, &subvol_root, true);
 	if (ret)
-		return ret;
+		goto err;
+out:
+err:
 fsck_err:
+	bch2_trans_iter_exit(&subvol_iter);
 	return ret;
 }