bcachefs: More renaming

Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>

diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c
index 91047f378e8fa2199f45190e9524a6b643c247bc..bc93fac24ce1c7baf24ea4a627350de18e2262b2 100644 (file)
--- a/fs/bcachefs/btree_iter.c
+++ b/fs/bcachefs/btree_iter.c
@@ -240,7 +240,7 @@ static inline bool btree_iter_get_locks(struct btree_trans *trans,
        if (iter->uptodate == BTREE_ITER_NEED_RELOCK)
                iter->uptodate = BTREE_ITER_NEED_PEEK;
 
-       bch2_btree_trans_verify_locks(trans);
+       bch2_trans_verify_locks(trans);
 
        return iter->uptodate < BTREE_ITER_NEED_RELOCK;
 }
@@ -380,7 +380,7 @@ static void bch2_btree_iter_verify_locks(struct btree_iter *iter)
        }
 }
 
-void bch2_btree_trans_verify_locks(struct btree_trans *trans)
+void bch2_trans_verify_locks(struct btree_trans *trans)
 {
        struct btree_iter *iter;
 
@@ -704,7 +704,7 @@ static void bch2_btree_iter_verify_entry_exit(struct btree_iter *iter)
                bkey_cmp(iter->pos, iter->k.p) > 0));
 }
 
-void bch2_btree_trans_verify_iters(struct btree_trans *trans, struct btree *b)
+void bch2_trans_verify_iters(struct btree_trans *trans, struct btree *b)
 {
        struct btree_iter *iter;
 

diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h
index 0f65e24bf102e70d1926fced8841ca109bcab061..7aee1a38d9a80c40e24844f54d5028f3c9b77e0a 100644 (file)
--- a/fs/bcachefs/btree_iter.h
+++ b/fs/bcachefs/btree_iter.h
@@ -127,12 +127,12 @@ __trans_next_iter_with_node(struct btree_trans *trans, struct btree *b,
                                                 (_iter)->idx + 1))
 
 #ifdef CONFIG_BCACHEFS_DEBUG
-void bch2_btree_trans_verify_iters(struct btree_trans *, struct btree *);
-void bch2_btree_trans_verify_locks(struct btree_trans *);
+void bch2_trans_verify_iters(struct btree_trans *, struct btree *);
+void bch2_trans_verify_locks(struct btree_trans *);
 #else
-static inline void bch2_btree_trans_verify_iters(struct btree_trans *trans,
-                                                struct btree *b) {}
-static inline void bch2_btree_trans_verify_locks(struct btree_trans *iter) {}
+static inline void bch2_trans_verify_iters(struct btree_trans *trans,
+                                          struct btree *b) {}
+static inline void bch2_trans_verify_locks(struct btree_trans *iter) {}
 #endif
 
 void bch2_btree_iter_fix_key_modified(struct btree_trans *trans,

diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c
index 80227e032103fe3d1a736c67bb7a01b70b6a6659..b115b9246880915b6f2750ecdf13730ae6bf7057 100644 (file)
--- a/fs/bcachefs/btree_update_interior.c
+++ b/fs/bcachefs/btree_update_interior.c
@@ -1451,7 +1451,7 @@ static void btree_split(struct btree_update *as,
                six_unlock_intent(&n2->c.lock);
        six_unlock_intent(&n1->c.lock);
 
-       bch2_btree_trans_verify_locks(trans);
+       bch2_trans_verify_locks(trans);
 
        bch2_time_stats_update(&c->times[BCH_TIME_btree_node_split],
                               start_time);
@@ -1474,7 +1474,7 @@ bch2_btree_insert_keys_interior(struct btree_update *as,
        trans_for_each_iter_with_node(trans, b, linked)
                bch2_btree_node_iter_peek(&linked->l[b->c.level].iter, b);
 
-       bch2_btree_trans_verify_iters(trans, b);
+       bch2_trans_verify_iters(trans, b);
 }
 
 /**
@@ -1706,7 +1706,7 @@ retry:
 
        bch2_trans_node_add(trans, n);
 
-       bch2_btree_trans_verify_iters(trans, n);
+       bch2_trans_verify_iters(trans, n);
 
        bch2_btree_node_free_inmem(trans, b);
        bch2_btree_node_free_inmem(trans, m);
@@ -1715,7 +1715,7 @@ retry:
 
        bch2_btree_update_done(as);
 out:
-       bch2_btree_trans_verify_locks(trans);
+       bch2_trans_verify_locks(trans);
        bch2_trans_iter_free(trans, sib_iter);
 
        /*

diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c
index 20b950ce31f11d46261a690c688b86ba9b0640f6..4bcfa25e68e3337789074231cea51a96afc56e0d 100644 (file)
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -580,7 +580,7 @@ static inline int do_bch2_trans_commit(struct btree_trans *trans,
                }
                btree_insert_entry_checks(trans, i);
        }
-       bch2_btree_trans_verify_locks(trans);
+       bch2_trans_verify_locks(trans);
 
        trans_for_each_update(trans, i)
                if (!same_leaf_as_prev(trans, i))
@@ -816,7 +816,7 @@ retry:
        ret = do_bch2_trans_commit(trans, &i, _RET_IP_);
 
        /* make sure we didn't drop or screw up locks: */
-       bch2_btree_trans_verify_locks(trans);
+       bch2_trans_verify_locks(trans);
 
        if (ret)
                goto err;