diff options
Diffstat (limited to 'libbcachefs/fsck.c')
| -rw-r--r-- | libbcachefs/fsck.c | 27 |
1 files changed, 10 insertions, 17 deletions
diff --git a/libbcachefs/fsck.c b/libbcachefs/fsck.c index 998c10ab..433552df 100644 --- a/libbcachefs/fsck.c +++ b/libbcachefs/fsck.c @@ -57,7 +57,7 @@ static int remove_dirent(struct btree_trans *trans, name.name = buf; /* Unlock so we don't deadlock, after copying name: */ - bch2_btree_trans_unlock(trans); + bch2_trans_unlock(trans); ret = bch2_inode_find_by_inum(c, dir_inum, &dir_inode); if (ret) { @@ -450,8 +450,7 @@ static int check_extents(struct bch_fs *c) u64 i_sectors; int ret = 0; - bch2_trans_init(&trans, c); - bch2_trans_preload_iters(&trans); + bch2_trans_init(&trans, c, BTREE_ITER_MAX, 0); bch_verbose(c, "checking extents"); @@ -546,8 +545,7 @@ static int check_dirents(struct bch_fs *c) bch_verbose(c, "checking dirents"); - bch2_trans_init(&trans, c); - bch2_trans_preload_iters(&trans); + bch2_trans_init(&trans, c, BTREE_ITER_MAX, 0); hash_check_init(&h); @@ -703,8 +701,7 @@ static int check_xattrs(struct bch_fs *c) hash_check_init(&h); - bch2_trans_init(&trans, c); - bch2_trans_preload_iters(&trans); + bch2_trans_init(&trans, c, BTREE_ITER_MAX, 0); iter = bch2_trans_get_iter(&trans, BTREE_ID_XATTRS, POS(BCACHEFS_ROOT_INO, 0), 0); @@ -917,8 +914,7 @@ static int check_directory_structure(struct bch_fs *c, u64 d_inum; int ret = 0; - bch2_trans_init(&trans, c); - bch2_trans_preload_iters(&trans); + bch2_trans_init(&trans, c, BTREE_ITER_MAX, 0); bch_verbose(c, "checking directory structure"); @@ -1014,7 +1010,7 @@ retry: if (fsck_err_on(!inode_bitmap_test(&dirs_done, k.k->p.inode), c, "unreachable directory found (inum %llu)", k.k->p.inode)) { - bch2_btree_trans_unlock(&trans); + bch2_trans_unlock(&trans); ret = reattach_inode(c, lostfound_inode, k.k->p.inode); if (ret) { @@ -1084,8 +1080,7 @@ static int bch2_gc_walk_dirents(struct bch_fs *c, nlink_table *links, u64 d_inum; int ret; - bch2_trans_init(&trans, c); - bch2_trans_preload_iters(&trans); + bch2_trans_init(&trans, c, BTREE_ITER_MAX, 0); inc_link(c, links, range_start, range_end, BCACHEFS_ROOT_INO, false); @@ -1228,7 +1223,7 @@ static int check_inode(struct btree_trans *trans, ret = bch2_inode_unpack(inode, &u); - bch2_btree_trans_unlock(trans); + bch2_trans_unlock(trans); if (bch2_fs_inconsistent_on(ret, c, "error unpacking inode %llu in fsck", @@ -1333,8 +1328,7 @@ static int bch2_gc_walk_inodes(struct bch_fs *c, int ret = 0, ret2 = 0; u64 nlinks_pos; - bch2_trans_init(&trans, c); - bch2_trans_preload_iters(&trans); + bch2_trans_init(&trans, c, BTREE_ITER_MAX, 0); iter = bch2_trans_get_iter(&trans, BTREE_ID_INODES, POS(range_start, 0), 0); @@ -1458,8 +1452,7 @@ int bch2_fsck_walk_inodes_only(struct bch_fs *c) struct bkey_s_c_inode inode; int ret; - bch2_trans_init(&trans, c); - bch2_trans_preload_iters(&trans); + bch2_trans_init(&trans, c, BTREE_ITER_MAX, 0); for_each_btree_key(&trans, iter, BTREE_ID_INODES, POS_MIN, 0, k, ret) { if (k.k->type != KEY_TYPE_inode) |