bcachefs: minor bch2_btree_path_set_pos() optimization

bpos_eq() is cheaper than bpos_cmp()

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

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index 79e6ec7b9a5271b4964d73c1bcfcf41de8e9b054..f16fefbb64977b4068047764528e9918d2039142 100644 (file)
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -1221,8 +1221,10 @@ struct btree_path *__bch2_btree_path_make_mut(struct btree_trans *trans,
 struct btree_path * __must_check
 __bch2_btree_path_set_pos(struct btree_trans *trans,
                   struct btree_path *path, struct bpos new_pos,
-                  bool intent, unsigned long ip, int cmp)
+                  bool intent, unsigned long ip)
 {
+       int cmp = bpos_cmp(new_pos, path->pos);
+
        bch2_trans_verify_not_in_restart(trans);
        EBUG_ON(!path->ref);
 

diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h
index 29f02335642e9c1684e5593446d046439c17c584..3b981144e4722600be0aee0c952ef2608efa49d6 100644 (file)
--- a/fs/bcachefs/btree_iter.h
+++ b/fs/bcachefs/btree_iter.h
@@ -176,17 +176,15 @@ bch2_btree_path_make_mut(struct btree_trans *trans,
 
 struct btree_path * __must_check
 __bch2_btree_path_set_pos(struct btree_trans *, struct btree_path *,
-                       struct bpos, bool, unsigned long, int);
+                       struct bpos, bool, unsigned long);
 
 static inline struct btree_path * __must_check
 bch2_btree_path_set_pos(struct btree_trans *trans,
                   struct btree_path *path, struct bpos new_pos,
                   bool intent, unsigned long ip)
 {
-       int cmp = bpos_cmp(new_pos, path->pos);
-
-       return cmp
-               ? __bch2_btree_path_set_pos(trans, path, new_pos, intent, ip, cmp)
+       return !bpos_eq(new_pos, path->pos)
+               ? __bch2_btree_path_set_pos(trans, path, new_pos, intent, ip)
                : path;
 }