From c298fd7d346f5a7c55c4f1d01f97fbd39da9ff53 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 26 Sep 2022 18:15:33 -0400 Subject: [PATCH] bcachefs; Mark __bch2_trans_iter_init as inline This function is fairly small and only used in two places: one very hot, the other cold, so it should definitely be inlined. Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_iter.c | 12 ++++++------ fs/bcachefs/btree_update_interior.c | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index 366be8015b970..67a1e0d70ed92 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -2581,12 +2581,12 @@ void bch2_trans_iter_exit(struct btree_trans *trans, struct btree_iter *iter) iter->key_cache_path = NULL; } -static void __bch2_trans_iter_init(struct btree_trans *trans, - struct btree_iter *iter, - enum btree_id btree_id, struct bpos pos, - unsigned locks_want, - unsigned depth, - unsigned flags) +static inline void __bch2_trans_iter_init(struct btree_trans *trans, + struct btree_iter *iter, + enum btree_id btree_id, struct bpos pos, + unsigned locks_want, + unsigned depth, + unsigned flags) { if (trans->restarted) panic("bch2_trans_iter_init(): in transaction restart, %s by %pS\n", diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index 797efa738dc4f..fd44492150b05 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -36,8 +36,7 @@ static struct btree_path *get_unlocked_mut_path(struct btree_trans *trans, struct btree_path *path; path = bch2_path_get(trans, btree_id, pos, level + 1, level, - BTREE_ITER_NOPRESERVE| - BTREE_ITER_INTENT); + BTREE_ITER_NOPRESERVE|BTREE_ITER_INTENT); path = bch2_btree_path_make_mut(trans, path, true); bch2_btree_path_downgrade(trans, path); __bch2_btree_path_unlock(trans, path); -- 2.30.2