From: Brian Foster Date: Wed, 19 Jul 2023 12:53:03 +0000 (-0400) Subject: bcachefs: remove unnecessary btree_insert_key_leaf() wrapper X-Git-Tag: io_uring-6.7-2023-11-10~119^2~176 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=a2437bba0561e94abe2f9254297b25ca13c92c23;p=linux-block.git bcachefs: remove unnecessary btree_insert_key_leaf() wrapper This is in preparation to support prejournaled keys. We want the ability to optionally pass a seq stored in the btree update rather than the seq of the committing transaction. Signed-off-by: Brian Foster Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index 3638cef211b2..11b992282032 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -290,12 +290,6 @@ inline void bch2_btree_insert_key_leaf(struct btree_trans *trans, bch2_trans_node_reinit_iter(trans, b); } -static void btree_insert_key_leaf(struct btree_trans *trans, - struct btree_insert_entry *insert) -{ - bch2_btree_insert_key_leaf(trans, insert->path, insert->k, trans->journal_res.seq); -} - /* Cached btree updates: */ /* Normal update interface: */ @@ -753,7 +747,7 @@ bch2_trans_commit_write_locked(struct btree_trans *trans, unsigned flags, i->k->k.needs_whiteout = false; if (!i->cached) - btree_insert_key_leaf(trans, i); + bch2_btree_insert_key_leaf(trans, i->path, i->k, trans->journal_res.seq); else if (!i->key_cache_already_flushed) bch2_btree_insert_key_cached(trans, flags, i); else {