Skip to content

L
linux
Commit a0a56879 authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet
Browse files
Options

bcachefs: More renaming 

Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
parent f7a966a3
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 14 deletions
fs/bcachefs/btree_iter.c
View file @ a0a56879
...@@ -240,7 +240,7 @@ static inline bool btree_iter_get_locks(struct btree_trans *trans, ...@@ -240,7 +240,7 @@ static inline bool btree_iter_get_locks(struct btree_trans *trans,
if (iter->uptodate == BTREE_ITER_NEED_RELOCK) if (iter->uptodate == BTREE_ITER_NEED_RELOCK)
iter->uptodate = BTREE_ITER_NEED_PEEK; iter->uptodate = BTREE_ITER_NEED_PEEK;
bch2_btree_trans_verify_locks(trans); bch2_trans_verify_locks(trans);
return iter->uptodate < BTREE_ITER_NEED_RELOCK; return iter->uptodate < BTREE_ITER_NEED_RELOCK;
} }
...@@ -380,7 +380,7 @@ static void bch2_btree_iter_verify_locks(struct btree_iter *iter) ...@@ -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; struct btree_iter *iter;
...@@ -704,7 +704,7 @@ static void bch2_btree_iter_verify_entry_exit(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)); 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; struct btree_iter *iter;
......
fs/bcachefs/btree_iter.h
View file @ a0a56879
...@@ -127,12 +127,12 @@ __trans_next_iter_with_node(struct btree_trans *trans, struct btree *b, ...@@ -127,12 +127,12 @@ __trans_next_iter_with_node(struct btree_trans *trans, struct btree *b,
(_iter)->idx + 1)) (_iter)->idx + 1))
#ifdef CONFIG_BCACHEFS_DEBUG #ifdef CONFIG_BCACHEFS_DEBUG
void bch2_btree_trans_verify_iters(struct btree_trans *, struct btree *); void bch2_trans_verify_iters(struct btree_trans *, struct btree *);
void bch2_btree_trans_verify_locks(struct btree_trans *); void bch2_trans_verify_locks(struct btree_trans *);
#else #else
static inline void bch2_btree_trans_verify_iters(struct btree_trans *trans, static inline void bch2_trans_verify_iters(struct btree_trans *trans,
struct btree *b) {} struct btree *b) {}
static inline void bch2_btree_trans_verify_locks(struct btree_trans *iter) {} static inline void bch2_trans_verify_locks(struct btree_trans *iter) {}
#endif #endif
void bch2_btree_iter_fix_key_modified(struct btree_trans *trans, void bch2_btree_iter_fix_key_modified(struct btree_trans *trans,
......
fs/bcachefs/btree_update_interior.c
View file @ a0a56879
...@@ -1451,7 +1451,7 @@ static void btree_split(struct btree_update *as, ...@@ -1451,7 +1451,7 @@ static void btree_split(struct btree_update *as,
six_unlock_intent(&n2->c.lock); six_unlock_intent(&n2->c.lock);
six_unlock_intent(&n1->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], bch2_time_stats_update(&c->times[BCH_TIME_btree_node_split],
start_time); start_time);
...@@ -1474,7 +1474,7 @@ bch2_btree_insert_keys_interior(struct btree_update *as, ...@@ -1474,7 +1474,7 @@ bch2_btree_insert_keys_interior(struct btree_update *as,
trans_for_each_iter_with_node(trans, b, linked) trans_for_each_iter_with_node(trans, b, linked)
bch2_btree_node_iter_peek(&linked->l[b->c.level].iter, b); 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 @@ int __bch2_foreground_maybe_merge(struct btree_trans *trans, ...@@ -1706,7 +1706,7 @@ int __bch2_foreground_maybe_merge(struct btree_trans *trans,
bch2_trans_node_add(trans, n); 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, b);
bch2_btree_node_free_inmem(trans, m); bch2_btree_node_free_inmem(trans, m);
...@@ -1715,7 +1715,7 @@ int __bch2_foreground_maybe_merge(struct btree_trans *trans, ...@@ -1715,7 +1715,7 @@ int __bch2_foreground_maybe_merge(struct btree_trans *trans,
bch2_btree_update_done(as); bch2_btree_update_done(as);
out: out:
bch2_btree_trans_verify_locks(trans); bch2_trans_verify_locks(trans);
bch2_trans_iter_free(trans, sib_iter); bch2_trans_iter_free(trans, sib_iter);
/* /*
......
fs/bcachefs/btree_update_leaf.c
View file @ a0a56879
...@@ -580,7 +580,7 @@ static inline int do_bch2_trans_commit(struct btree_trans *trans, ...@@ -580,7 +580,7 @@ static inline int do_bch2_trans_commit(struct btree_trans *trans,
} }
btree_insert_entry_checks(trans, i); btree_insert_entry_checks(trans, i);
} }
bch2_btree_trans_verify_locks(trans); bch2_trans_verify_locks(trans);
trans_for_each_update(trans, i) trans_for_each_update(trans, i)
if (!same_leaf_as_prev(trans, i)) if (!same_leaf_as_prev(trans, i))
...@@ -816,7 +816,7 @@ int __bch2_trans_commit(struct btree_trans *trans) ...@@ -816,7 +816,7 @@ int __bch2_trans_commit(struct btree_trans *trans)
ret = do_bch2_trans_commit(trans, &i, _RET_IP_); ret = do_bch2_trans_commit(trans, &i, _RET_IP_);
/* make sure we didn't drop or screw up locks: */ /* make sure we didn't drop or screw up locks: */
bch2_btree_trans_verify_locks(trans); bch2_trans_verify_locks(trans);
if (ret) if (ret)
goto err; goto err;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7