bcachefs: bch2_trans_update() now takes struct btree_insert_entry

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/acl.c b/fs/bcachefs/acl.c
index 7ee2022d9501981caac1296636cdcf20b57d3b2e..c81e5365ec84e9618185f08e16bc9983f244673b 100644 (file)
--- a/fs/bcachefs/acl.c
+++ b/fs/bcachefs/acl.c
@@ -375,7 +375,7 @@ int bch2_acl_chmod(struct btree_trans *trans,
                goto err;
        }
 
-       bch2_trans_update(trans, iter, &new->k_i, 0);
+       bch2_trans_update(trans, BTREE_INSERT_ENTRY(iter, &new->k_i));
        *new_acl = acl;
        acl = NULL;
 err:

diff --git a/fs/bcachefs/btree_update.h b/fs/bcachefs/btree_update.h
index 451d486fb032b0f1e11333a21468ea8fb6d8e020..31b72895f6ebf8f6f79c49002aa42b249998edf0 100644 (file)
--- a/fs/bcachefs/btree_update.h
+++ b/fs/bcachefs/btree_update.h
@@ -140,8 +140,15 @@ int bch2_btree_node_update_key(struct bch_fs *, struct btree_iter *,
 
 /* new transactional interface: */
 
-void bch2_trans_update(struct btree_trans *, struct btree_iter *,
-                            struct bkey_i *, unsigned);
+static inline void
+bch2_trans_update(struct btree_trans *trans,
+                 struct btree_insert_entry entry)
+{
+       BUG_ON(trans->nr_updates >= ARRAY_SIZE(trans->updates));
+
+       trans->updates[trans->nr_updates++] = entry;
+}
+
 int bch2_trans_commit(struct btree_trans *,
                      struct disk_reservation *,
                      struct extent_insert_hook *,

diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c
index 5cd20b5727591bf990cac606166a9e6290f007c1..7ce2e35dafa2a95931576d9d8f4b8b34bd1c5007 100644 (file)
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -581,26 +581,6 @@ err:
        goto out;
 }
 
-void bch2_trans_update(struct btree_trans *trans,
-                      struct btree_iter *iter,
-                      struct bkey_i *k,
-                      unsigned extra_journal_res)
-{
-       struct btree_insert_entry *i;
-
-       BUG_ON(trans->nr_updates >= ARRAY_SIZE(trans->updates));
-
-       i = &trans->updates[trans->nr_updates++];
-
-       *i = (struct btree_insert_entry) {
-               .iter   = iter,
-               .k              = k,
-               .extra_res      = extra_journal_res,
-       };
-
-       btree_insert_entry_checks(trans->c, i);
-}
-
 int bch2_trans_commit(struct btree_trans *trans,
                      struct disk_reservation *disk_res,
                      struct extent_insert_hook *hook,

diff --git a/fs/bcachefs/dirent.c b/fs/bcachefs/dirent.c
index 9e5936faf1afd3290675b7c263881b545b181e72..18078cc2ca622975050118129bd3aefbdf5a715e 100644 (file)
--- a/fs/bcachefs/dirent.c
+++ b/fs/bcachefs/dirent.c
@@ -290,7 +290,9 @@ int bch2_dirent_rename(struct btree_trans *trans,
                                 * new_dst at the src position:
                                 */
                                new_dst->k.p = src_iter->pos;
-                               bch2_trans_update(trans, src_iter, &new_dst->k_i, 0);
+                               bch2_trans_update(trans,
+                                       BTREE_INSERT_ENTRY(src_iter,
+                                                          &new_dst->k_i));
                                return 0;
                        } else {
                                /* If we're overwriting, we can't insert new_dst
@@ -313,8 +315,8 @@ int bch2_dirent_rename(struct btree_trans *trans,
                }
        }
 
-       bch2_trans_update(trans, src_iter, &new_src->k_i, 0);
-       bch2_trans_update(trans, dst_iter, &new_dst->k_i, 0);
+       bch2_trans_update(trans, BTREE_INSERT_ENTRY(src_iter, &new_src->k_i));
+       bch2_trans_update(trans, BTREE_INSERT_ENTRY(dst_iter, &new_dst->k_i));
        return 0;
 }
 

diff --git a/fs/bcachefs/fs.c b/fs/bcachefs/fs.c
index 2e2a5acae0ebdc5faf6a54b6a7c852619943ac05..f10ee147d389cb73905393a4cf5964a2f51c375d 100644 (file)
--- a/fs/bcachefs/fs.c
+++ b/fs/bcachefs/fs.c
@@ -185,7 +185,7 @@ int __must_check bch2_write_inode_trans(struct btree_trans *trans,
                return PTR_ERR(inode_p);
 
        bch2_inode_pack(inode_p, inode_u);
-       bch2_trans_update(trans, iter, &inode_p->inode.k_i, 0);
+       bch2_trans_update(trans, BTREE_INSERT_ENTRY(iter, &inode_p->inode.k_i));
        return 0;
 }
 

diff --git a/fs/bcachefs/inode.c b/fs/bcachefs/inode.c
index 2d635555bffbf672df1800a427a89b592c872e9c..f40ec37d7f0fbc1b145c28825091d211471f8fe9 100644 (file)
--- a/fs/bcachefs/inode.c
+++ b/fs/bcachefs/inode.c
@@ -346,7 +346,8 @@ again:
                        inode_u->bi_generation  = bkey_generation(k);
 
                        bch2_inode_pack(inode_p, inode_u);
-                       bch2_trans_update(trans, iter, &inode_p->inode.k_i, 0);
+                       bch2_trans_update(trans,
+                               BTREE_INSERT_ENTRY(iter, &inode_p->inode.k_i));
                        return 0;
                }
        }

diff --git a/fs/bcachefs/str_hash.h b/fs/bcachefs/str_hash.h
index 0947fdcdc4cdeb5454ec2a99f0e46f225f60d035..fbd6c3372677655a04cc8c82ccc70b8a1a01e749 100644 (file)
--- a/fs/bcachefs/str_hash.h
+++ b/fs/bcachefs/str_hash.h
@@ -255,14 +255,14 @@ not_found:
                return -ENOENT;
 
        insert->k.p = slot->pos;
-       bch2_trans_update(trans, slot, insert, 0);
+       bch2_trans_update(trans, BTREE_INSERT_ENTRY(slot, insert));
        return 0;
 found:
        if (flags & BCH_HASH_SET_MUST_CREATE)
                return -EEXIST;
 
        insert->k.p = iter->pos;
-       bch2_trans_update(trans, iter, insert, 0);
+       bch2_trans_update(trans, BTREE_INSERT_ENTRY(iter, insert));
        return 0;
 }
 
@@ -297,7 +297,7 @@ static inline int bch2_hash_delete_at(struct btree_trans *trans,
        delete->k.p = iter->pos;
        delete->k.type = ret ? desc.whiteout_type : KEY_TYPE_DELETED;
 
-       bch2_trans_update(trans, iter, delete, 0);
+       bch2_trans_update(trans, BTREE_INSERT_ENTRY(iter, delete));
        return 0;
 }