From deb0e573b4c1f1f0733662976230a77624160794 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Mon, 30 Aug 2021 17:31:09 -0400 Subject: [PATCH] bcachefs: Kill BTREE_ITER_NEED_PEEK This was used for an optimization that hasn't existing in quite awhile - iter->uptodate will probably be going away as well. Signed-off-by: Kent Overstreet --- fs/bcachefs/btree_iter.c | 15 ++------------- fs/bcachefs/btree_iter.h | 2 +- fs/bcachefs/btree_key_cache.c | 2 +- fs/bcachefs/btree_types.h | 5 ++--- 4 files changed, 6 insertions(+), 18 deletions(-) diff --git a/fs/bcachefs/btree_iter.c b/fs/bcachefs/btree_iter.c index bc93fac24ce1c..fc0a32dd427f3 100644 --- a/fs/bcachefs/btree_iter.c +++ b/fs/bcachefs/btree_iter.c @@ -238,7 +238,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; + iter->uptodate = BTREE_ITER_UPTODATE; bch2_trans_verify_locks(trans); @@ -752,8 +752,6 @@ static void __bch2_btree_iter_fix_key_modified(struct btree_iter *iter, if (bkey_iter_pos_cmp(l->b, where, &iter->real_pos) < 0) bch2_btree_node_iter_advance(&l->iter, l->b); - - btree_iter_set_dirty(iter, BTREE_ITER_NEED_PEEK); } void bch2_btree_iter_fix_key_modified(struct btree_trans *trans, @@ -859,11 +857,6 @@ fixup_done: b, t, k2); } } - - if (!b->c.level && - node_iter == &iter->l[0].iter && - iter_current_key_modified) - btree_iter_set_dirty(iter, BTREE_ITER_NEED_PEEK); } void bch2_btree_node_iter_fix(struct btree_trans *trans, @@ -1037,8 +1030,6 @@ static inline void __btree_iter_level_init(struct btree_iter *iter, */ if (level) bch2_btree_node_iter_peek(&l->iter, l->b); - - btree_iter_set_dirty(iter, BTREE_ITER_NEED_PEEK); } static inline void btree_iter_level_init(struct btree_trans *trans, @@ -1482,7 +1473,7 @@ static int btree_iter_traverse_one(struct btree_trans *trans, } } - iter->uptodate = BTREE_ITER_NEED_PEEK; + iter->uptodate = BTREE_ITER_UPTODATE; out: BUG_ON((ret == -EINTR) != !!trans->restarted); trace_iter_traverse(trans->ip, trace_ip, @@ -1672,8 +1663,6 @@ static void btree_iter_set_search_pos(struct btree_iter *iter, struct bpos new_p out: if (l != iter->level) btree_iter_set_dirty(iter, BTREE_ITER_NEED_TRAVERSE); - else - btree_iter_set_dirty(iter, BTREE_ITER_NEED_PEEK); bch2_btree_iter_verify(iter); #ifdef CONFIG_BCACHEFS_DEBUG diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h index 7aee1a38d9a80..4ba55e02d4b74 100644 --- a/fs/bcachefs/btree_iter.h +++ b/fs/bcachefs/btree_iter.h @@ -165,7 +165,7 @@ static inline bool bch2_btree_iter_upgrade(struct btree_trans *trans, return iter->locks_want < new_locks_want ? __bch2_btree_iter_upgrade(trans, iter, new_locks_want) - : iter->uptodate <= BTREE_ITER_NEED_PEEK; + : iter->uptodate == BTREE_ITER_UPTODATE; } void __bch2_btree_iter_downgrade(struct btree_iter *, unsigned); diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c index ba03581c52906..61210db57f564 100644 --- a/fs/bcachefs/btree_key_cache.c +++ b/fs/bcachefs/btree_key_cache.c @@ -340,7 +340,7 @@ fill: if (!test_bit(BKEY_CACHED_ACCESSED, &ck->flags)) set_bit(BKEY_CACHED_ACCESSED, &ck->flags); - iter->uptodate = BTREE_ITER_NEED_PEEK; + iter->uptodate = BTREE_ITER_UPTODATE; if ((iter->flags & BTREE_ITER_INTENT) && !bch2_btree_iter_upgrade(trans, iter, 1)) { diff --git a/fs/bcachefs/btree_types.h b/fs/bcachefs/btree_types.h index 1ddb2eea5b156..d288404e35c41 100644 --- a/fs/bcachefs/btree_types.h +++ b/fs/bcachefs/btree_types.h @@ -218,9 +218,8 @@ enum btree_iter_type { enum btree_iter_uptodate { BTREE_ITER_UPTODATE = 0, - BTREE_ITER_NEED_PEEK = 1, - BTREE_ITER_NEED_RELOCK = 2, - BTREE_ITER_NEED_TRAVERSE = 3, + BTREE_ITER_NEED_RELOCK = 1, + BTREE_ITER_NEED_TRAVERSE = 2, }; #define BTREE_ITER_NO_NODE_GET_LOCKS ((struct btree *) 1) -- 2.30.2