bcachefs: Rename __bch2_trans_do() -> commit_do()

Better/more descriptive naming, and prep for adding
nested_lockrestart_do() and nested_commit_do().

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>

diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c
index a511ab9e4e7c9fe9c7cbd2639b83ecb21c631bca..f515e679a90ccaf7f60007d782d5d0005af8bb7a 100644 (file)
--- a/fs/bcachefs/alloc_background.c
+++ b/fs/bcachefs/alloc_background.c
@@ -787,7 +787,7 @@ int bch2_check_alloc_info(struct bch_fs *c)
        bch2_trans_iter_init(&trans, &freespace_iter, BTREE_ID_freespace, POS_MIN,
                             BTREE_ITER_PREFETCH);
        while (1) {
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_NOFAIL|
                                      BTREE_INSERT_LAZY_RW,
                        bch2_check_alloc_key(&trans, &iter,
@@ -808,7 +808,7 @@ int bch2_check_alloc_info(struct bch_fs *c)
        bch2_trans_iter_init(&trans, &iter, BTREE_ID_need_discard, POS_MIN,
                             BTREE_ITER_PREFETCH);
        while (1) {
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_NOFAIL|
                                      BTREE_INSERT_LAZY_RW,
                        bch2_check_discard_freespace_key(&trans, &iter));
@@ -825,7 +825,7 @@ int bch2_check_alloc_info(struct bch_fs *c)
        bch2_trans_iter_init(&trans, &iter, BTREE_ID_freespace, POS_MIN,
                             BTREE_ITER_PREFETCH);
        while (1) {
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_NOFAIL|
                                      BTREE_INSERT_LAZY_RW,
                        bch2_check_discard_freespace_key(&trans, &iter));
@@ -930,7 +930,7 @@ int bch2_check_alloc_to_lru_refs(struct bch_fs *c)
 
        for_each_btree_key(&trans, iter, BTREE_ID_alloc, POS_MIN,
                           BTREE_ITER_PREFETCH, k, ret) {
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_NOFAIL|
                                      BTREE_INSERT_LAZY_RW,
                        bch2_check_alloc_to_lru_ref(&trans, &iter));
@@ -1060,7 +1060,7 @@ static void bch2_do_discards_work(struct work_struct *work)
                        continue;
                }
 
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_USE_RESERVE|
                                      BTREE_INSERT_NOFAIL,
                                bch2_clear_need_discard(&trans, k.k->p, ca, &discard_done));
@@ -1198,7 +1198,7 @@ static void bch2_do_invalidates_work(struct work_struct *work)
                        should_invalidate_buckets(ca, bch2_dev_usage_read(ca));
 
                while (nr_to_invalidate-- >= 0) {
-                       ret = __bch2_trans_do(&trans, NULL, NULL,
+                       ret = commit_do(&trans, NULL, NULL,
                                              BTREE_INSERT_USE_RESERVE|
                                              BTREE_INSERT_NOFAIL,
                                        invalidate_one_bucket(&trans, ca, &bucket,
@@ -1254,7 +1254,7 @@ static int bch2_dev_freespace_init(struct bch_fs *c, struct bch_dev *ca)
                if (iter.pos.offset >= ca->mi.nbuckets)
                        break;
 
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_LAZY_RW,
                                 bucket_freespace_init(&trans, &iter));
                if (ret)

diff --git a/fs/bcachefs/btree_gc.c b/fs/bcachefs/btree_gc.c
index 8be1c9f2664d71779ce78736c0ba6a8ad2823183..ebb1ad4b8abe62406e171fe5d83cf8cecdfa3743 100644 (file)
--- a/fs/bcachefs/btree_gc.c
+++ b/fs/bcachefs/btree_gc.c
@@ -799,7 +799,7 @@ static int bch2_gc_mark_key(struct btree_trans *trans, enum btree_id btree_id,
                        atomic64_set(&c->key_version, k->k->version.lo);
        }
 
-       ret = __bch2_trans_do(trans, NULL, NULL, 0,
+       ret = commit_do(trans, NULL, NULL, 0,
                        bch2_mark_key(trans, old, *k, flags));
 fsck_err:
 err:
@@ -1435,7 +1435,7 @@ static int bch2_gc_alloc_done(struct bch_fs *c, bool metadata_only)
                        if (bkey_cmp(iter.pos, POS(ca->dev_idx, ca->mi.nbuckets)) >= 0)
                                break;
 
-                       ret = __bch2_trans_do(&trans, NULL, NULL,
+                       ret = commit_do(&trans, NULL, NULL,
                                              BTREE_INSERT_LAZY_RW,
                                        bch2_alloc_write_key(&trans, &iter,
                                                             metadata_only));
@@ -1589,7 +1589,7 @@ static int bch2_gc_reflink_done(struct bch_fs *c, bool metadata_only)
                        else
                                *bkey_refcount(new) = cpu_to_le64(r->refcount);
 
-                       ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+                       ret = commit_do(&trans, NULL, NULL, 0,
                                __bch2_btree_insert(&trans, BTREE_ID_reflink, new));
                        kfree(new);
 
@@ -1702,7 +1702,7 @@ inconsistent:
                        for (i = 0; i < new->v.nr_blocks; i++)
                                stripe_blockcount_set(&new->v, i, m ? m->block_sectors[i] : 0);
 
-                       ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+                       ret = commit_do(&trans, NULL, NULL, 0,
                                __bch2_btree_insert(&trans, BTREE_ID_reflink, &new->k_i));
                        kfree(new);
                }
@@ -2009,7 +2009,7 @@ int bch2_gc_gens(struct bch_fs *c)
 
        for_each_btree_key(&trans, iter, BTREE_ID_alloc, POS_MIN,
                           BTREE_ITER_PREFETCH, k, ret) {
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_NOFAIL,
                                bch2_alloc_write_oldest_gen(&trans, &iter));
                if (ret) {

diff --git a/fs/bcachefs/btree_update.h b/fs/bcachefs/btree_update.h
index 28f9585770068fd0ac5a1e701cf8c1cf6d037564..e9127dbf7e241ab62491af2e800dd15c8aa56d4b 100644 (file)
--- a/fs/bcachefs/btree_update.h
+++ b/fs/bcachefs/btree_update.h
@@ -118,7 +118,7 @@ static inline int bch2_trans_commit(struct btree_trans *trans,
        _ret;                                                           \
 })
 
-#define __bch2_trans_do(_trans, _disk_res, _journal_seq, _flags, _do)  \
+#define commit_do(_trans, _disk_res, _journal_seq, _flags, _do)        \
        lockrestart_do(_trans, _do ?: bch2_trans_commit(_trans, (_disk_res),\
                                        (_journal_seq), (_flags)))
 
@@ -128,8 +128,7 @@ static inline int bch2_trans_commit(struct btree_trans *trans,
        int _ret;                                                       \
                                                                        \
        bch2_trans_init(&trans, (_c), 0, 0);                            \
-       _ret = __bch2_trans_do(&trans, _disk_res, _journal_seq, _flags, \
-                              _do);                                    \
+       _ret = commit_do(&trans, _disk_res, _journal_seq, _flags, _do); \
        bch2_trans_exit(&trans);                                        \
                                                                        \
        _ret;                                                           \

diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
index eeaea292bd8026976142f9315303880989368427..ee95a79dc13e2d78b6489728e2091f25e754ae80 100644 (file)
--- a/fs/bcachefs/btree_update_interior.c
+++ b/fs/bcachefs/btree_update_interior.c
@@ -599,7 +599,7 @@ static void btree_update_nodes_written(struct btree_update *as)
         * which may require allocations as well.
         */
        bch2_trans_init(&trans, c, 0, 512);
-       ret = __bch2_trans_do(&trans, &as->disk_res, &journal_seq,
+       ret = commit_do(&trans, &as->disk_res, &journal_seq,
                              BTREE_INSERT_NOFAIL|
                              BTREE_INSERT_NOCHECK_RW|
                              BTREE_INSERT_JOURNAL_RECLAIM|

diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c
index eab01cc09337cbb12430e3a7be3744f695c24f1f..99c9d5b14d4874775e4a48f530f211f7c13fdab2 100644 (file)
--- a/fs/bcachefs/buckets.c
+++ b/fs/bcachefs/buckets.c
@@ -1853,7 +1853,7 @@ int bch2_trans_mark_metadata_bucket(struct btree_trans *trans,
                                    enum bch_data_type type,
                                    unsigned sectors)
 {
-       return __bch2_trans_do(trans, NULL, NULL, 0,
+       return commit_do(trans, NULL, NULL, 0,
                        __bch2_trans_mark_metadata_bucket(trans, ca, b, type, sectors));
 }
 

diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index b2bc28d0cf0511355199961f5a23abb1cd8c5b3d..08268fe1074fb5599d4d74e666c3b0f7c62c43aa 100644 (file)
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@ -443,7 +443,7 @@ static int __bch2_link(struct bch_fs *c,
        mutex_lock(&inode->ei_update_lock);
        bch2_trans_init(&trans, c, 4, 1024);
 
-       ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+       ret = commit_do(&trans, NULL, NULL, 0,
                        bch2_link_trans(&trans,
                                        inode_inum(dir),   &dir_u,
                                        inode_inum(inode), &inode_u,
@@ -492,7 +492,7 @@ int __bch2_unlink(struct inode *vdir, struct dentry *dentry,
        bch2_lock_inodes(INODE_UPDATE_LOCK, dir, inode);
        bch2_trans_init(&trans, c, 4, 1024);
 
-       ret = __bch2_trans_do(&trans, NULL, NULL,
+       ret = commit_do(&trans, NULL, NULL,
                              BTREE_INSERT_NOFAIL,
                        bch2_unlink_trans(&trans,
                                          inode_inum(dir), &dir_u,
@@ -614,7 +614,7 @@ static int bch2_rename2(struct mnt_idmap *idmap,
                        goto err;
        }
 
-       ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+       ret = commit_do(&trans, NULL, NULL, 0,
                        bch2_rename_trans(&trans,
                                          inode_inum(src_dir), &src_dir_u,
                                          inode_inum(dst_dir), &dst_dir_u,

diff --git a/fs/bcachefs/fsck.c b/fs/bcachefs/fsck.c
index f1abec95a740cb03e0b9facd37512677206d4e23..bdf0183d5d214dc6154940edf371740db7c98b34 100644 (file)
--- a/fs/bcachefs/fsck.c
+++ b/fs/bcachefs/fsck.c
@@ -220,7 +220,7 @@ static int write_inode(struct btree_trans *trans,
                       struct bch_inode_unpacked *inode,
                       u32 snapshot)
 {
-       int ret = __bch2_trans_do(trans, NULL, NULL,
+       int ret = commit_do(trans, NULL, NULL,
                                  BTREE_INSERT_NOFAIL|
                                  BTREE_INSERT_LAZY_RW,
                                  __write_inode(trans, inode, snapshot));
@@ -434,7 +434,7 @@ static int reattach_inode(struct btree_trans *trans,
                          struct bch_inode_unpacked *inode,
                          u32 inode_snapshot)
 {
-       int ret = __bch2_trans_do(trans, NULL, NULL,
+       int ret = commit_do(trans, NULL, NULL,
                                  BTREE_INSERT_LAZY_RW|
                                  BTREE_INSERT_NOFAIL,
                        __reattach_inode(trans, inode, inode_snapshot));
@@ -940,7 +940,7 @@ static int check_inodes(struct bch_fs *c, bool full)
                             BTREE_ITER_ALL_SNAPSHOTS);
 
        do {
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_LAZY_RW|
                                      BTREE_INSERT_NOFAIL,
                        check_inode(&trans, &iter, &prev, full));
@@ -1002,7 +1002,7 @@ static int check_subvols(struct bch_fs *c)
                             BTREE_ITER_PREFETCH);
 
        do {
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_LAZY_RW|
                                      BTREE_INSERT_NOFAIL,
                                      check_subvol(&trans, &iter));
@@ -1306,7 +1306,7 @@ static int check_extents(struct bch_fs *c)
                             BTREE_ITER_ALL_SNAPSHOTS);
 
        do {
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_LAZY_RW|
                                      BTREE_INSERT_NOFAIL,
                        check_extent(&trans, &iter, &w, &s));
@@ -1687,7 +1687,7 @@ static int check_dirents(struct bch_fs *c)
                             BTREE_ITER_ALL_SNAPSHOTS);
 
        do {
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_LAZY_RW|
                                      BTREE_INSERT_NOFAIL,
                        check_dirent(&trans, &iter, &hash_info,
@@ -1774,7 +1774,7 @@ static int check_xattrs(struct bch_fs *c)
                             BTREE_ITER_ALL_SNAPSHOTS);
 
        do {
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_LAZY_RW|
                                      BTREE_INSERT_NOFAIL,
                                      check_xattr(&trans, &iter, &hash_info,
@@ -1814,7 +1814,7 @@ static int check_root_trans(struct btree_trans *trans)
                root_subvol.v.flags     = 0;
                root_subvol.v.snapshot  = cpu_to_le32(snapshot);
                root_subvol.v.inode     = cpu_to_le64(inum);
-               ret = __bch2_trans_do(trans, NULL, NULL,
+               ret = commit_do(trans, NULL, NULL,
                                      BTREE_INSERT_NOFAIL|
                                      BTREE_INSERT_LAZY_RW,
                        __bch2_btree_insert(trans, BTREE_ID_subvolumes, &root_subvol.k_i));
@@ -1977,7 +1977,7 @@ static int check_path(struct btree_trans *trans,
                        if (!fsck_err(c, "directory structure loop"))
                                return 0;
 
-                       ret = __bch2_trans_do(trans, NULL, NULL,
+                       ret = commit_do(trans, NULL, NULL,
                                              BTREE_INSERT_NOFAIL|
                                              BTREE_INSERT_LAZY_RW,
                                        remove_backpointer(trans, inode));
@@ -2366,7 +2366,7 @@ static int fix_reflink_p(struct bch_fs *c)
                           BTREE_ITER_PREFETCH|
                           BTREE_ITER_ALL_SNAPSHOTS, k, ret) {
                if (k.k->type == KEY_TYPE_reflink_p) {
-                       ret = __bch2_trans_do(&trans, NULL, NULL,
+                       ret = commit_do(&trans, NULL, NULL,
                                              BTREE_INSERT_NOFAIL|
                                              BTREE_INSERT_LAZY_RW,
                                              fix_reflink_p_key(&trans, &iter));

diff --git a/fs/bcachefs/lru.c b/fs/bcachefs/lru.c
index 5a09b55006ff3ec1932dddb54dfa469faaa3a6d6..94ecb3a397602d90487887d0706a244556788ece 100644 (file)
--- a/fs/bcachefs/lru.c
+++ b/fs/bcachefs/lru.c
@@ -204,7 +204,7 @@ int bch2_check_lrus(struct bch_fs *c)
 
        for_each_btree_key(&trans, iter, BTREE_ID_lru, POS_MIN,
                           BTREE_ITER_PREFETCH, k, ret) {
-               ret = __bch2_trans_do(&trans, NULL, NULL,
+               ret = commit_do(&trans, NULL, NULL,
                                      BTREE_INSERT_NOFAIL|
                                      BTREE_INSERT_LAZY_RW,
                        bch2_check_lru_key(&trans, &iter));

diff --git a/fs/bcachefs/subvolume.c b/fs/bcachefs/subvolume.c
index 60b60de83f3e5cf3188e7309a5c2cde519541e5f..d74dc9843028dd0b85641c213fccc47c4e5dbfa1 100644 (file)
--- a/fs/bcachefs/subvolume.c
+++ b/fs/bcachefs/subvolume.c
@@ -605,7 +605,7 @@ static int bch2_snapshot_delete_keys_btree(struct btree_trans *trans,
                            bch2_btree_key_cache_flush(trans, btree_id, iter.pos))
                                continue;
 
-                       ret = __bch2_trans_do(trans, NULL, NULL,
+                       ret = commit_do(trans, NULL, NULL,
                                              BTREE_INSERT_NOFAIL,
                                bch2_btree_iter_traverse(&iter) ?:
                                bch2_btree_delete_at(trans, &iter,
@@ -664,7 +664,7 @@ static void bch2_delete_dead_snapshots_work(struct work_struct *work)
                if (ret)
                        continue;
 
-               ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+               ret = commit_do(&trans, NULL, NULL, 0,
                        bch2_snapshot_node_set_deleted(&trans, iter.pos.offset));
                if (ret) {
                        bch_err(c, "error deleting snapshot %llu: %i", iter.pos.offset, ret);
@@ -713,7 +713,7 @@ static void bch2_delete_dead_snapshots_work(struct work_struct *work)
        }
 
        for (i = 0; i < deleted.nr; i++) {
-               ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+               ret = commit_do(&trans, NULL, NULL, 0,
                        bch2_snapshot_node_delete(&trans, deleted.data[i]));
                if (ret) {
                        bch_err(c, "error deleting snapshot %u: %i",

diff --git a/fs/bcachefs/tests.c b/fs/bcachefs/tests.c
index fa3712a1478c52eb8f4e0f0ce0c376a5ad34dc64..bfcb133ff483072b749b6a407eafdd8de0b6f2b6 100644 (file)
--- a/fs/bcachefs/tests.c
+++ b/fs/bcachefs/tests.c
@@ -42,7 +42,7 @@ static int test_delete(struct bch_fs *c, u64 nr)
        bch2_trans_iter_init(&trans, &iter, BTREE_ID_xattrs, k.k.p,
                             BTREE_ITER_INTENT);
 
-       ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+       ret = commit_do(&trans, NULL, NULL, 0,
                bch2_btree_iter_traverse(&iter) ?:
                bch2_trans_update(&trans, &iter, &k.k_i, 0));
        if (ret) {
@@ -51,7 +51,7 @@ static int test_delete(struct bch_fs *c, u64 nr)
        }
 
        pr_info("deleting once");
-       ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+       ret = commit_do(&trans, NULL, NULL, 0,
                bch2_btree_iter_traverse(&iter) ?:
                bch2_btree_delete_at(&trans, &iter, 0));
        if (ret) {
@@ -60,7 +60,7 @@ static int test_delete(struct bch_fs *c, u64 nr)
        }
 
        pr_info("deleting twice");
-       ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+       ret = commit_do(&trans, NULL, NULL, 0,
                bch2_btree_iter_traverse(&iter) ?:
                bch2_btree_delete_at(&trans, &iter, 0));
        if (ret) {
@@ -88,7 +88,7 @@ static int test_delete_written(struct bch_fs *c, u64 nr)
        bch2_trans_iter_init(&trans, &iter, BTREE_ID_xattrs, k.k.p,
                             BTREE_ITER_INTENT);
 
-       ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+       ret = commit_do(&trans, NULL, NULL, 0,
                bch2_btree_iter_traverse(&iter) ?:
                bch2_trans_update(&trans, &iter, &k.k_i, 0));
        if (ret) {
@@ -99,7 +99,7 @@ static int test_delete_written(struct bch_fs *c, u64 nr)
        bch2_trans_unlock(&trans);
        bch2_journal_flush_all_pins(&c->journal);
 
-       ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+       ret = commit_do(&trans, NULL, NULL, 0,
                bch2_btree_iter_traverse(&iter) ?:
                bch2_btree_delete_at(&trans, &iter, 0));
        if (ret) {
@@ -552,7 +552,7 @@ static int rand_insert(struct bch_fs *c, u64 nr)
                k.k.p.offset = test_rand();
                k.k.p.snapshot = U32_MAX;
 
-               ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+               ret = commit_do(&trans, NULL, NULL, 0,
                        __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k.k_i));
                if (ret) {
                        bch_err(c, "error in rand_insert: %i", ret);
@@ -581,7 +581,7 @@ static int rand_insert_multi(struct bch_fs *c, u64 nr)
                        k[j].k.p.snapshot = U32_MAX;
                }
 
-               ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+               ret = commit_do(&trans, NULL, NULL, 0,
                        __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[0].k_i) ?:
                        __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[1].k_i) ?:
                        __bch2_btree_insert(&trans, BTREE_ID_xattrs, &k[2].k_i) ?:
@@ -668,7 +668,7 @@ static int rand_mixed(struct bch_fs *c, u64 nr)
 
        for (i = 0; i < nr; i++) {
                rand = test_rand();
-               ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+               ret = commit_do(&trans, NULL, NULL, 0,
                        rand_mixed_trans(&trans, &iter, &cookie, i, rand));
                if (ret) {
                        bch_err(c, "update error in rand_mixed: %i", ret);
@@ -714,7 +714,7 @@ static int rand_delete(struct bch_fs *c, u64 nr)
        for (i = 0; i < nr; i++) {
                struct bpos pos = SPOS(0, test_rand(), U32_MAX);
 
-               ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+               ret = commit_do(&trans, NULL, NULL, 0,
                        __do_delete(&trans, pos));
                if (ret) {
                        bch_err(c, "error in rand_delete: %i", ret);
@@ -743,7 +743,7 @@ static int seq_insert(struct bch_fs *c, u64 nr)
                           BTREE_ITER_SLOTS|BTREE_ITER_INTENT, k, ret) {
                insert.k.p = iter.pos;
 
-               ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+               ret = commit_do(&trans, NULL, NULL, 0,
                        bch2_btree_iter_traverse(&iter) ?:
                        bch2_trans_update(&trans, &iter, &insert.k_i, 0));
                if (ret) {
@@ -794,7 +794,7 @@ static int seq_overwrite(struct bch_fs *c, u64 nr)
 
                bkey_reassemble(&u.k_i, k);
 
-               ret = __bch2_trans_do(&trans, NULL, NULL, 0,
+               ret = commit_do(&trans, NULL, NULL, 0,
                        bch2_btree_iter_traverse(&iter) ?:
                        bch2_trans_update(&trans, &iter, &u.k_i, 0));
                if (ret) {