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 <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index 366be8015b9708a355595251ec4c89e333d7df28..67a1e0d70ed92542b7ab22114f9a386435d5e8d1 100644 (file)
--- 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 797efa738dc4f28c3e4644abd08ca4912e56d202..fd44492150b05eecc05d0ee37ea36c118bbb14aa 100644 (file)
--- 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);