iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bcachefs: Kill BTREE_ITER_NEED_PEEK

Browse Source 
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 <kent.overstreet@gmail.com>
This commit is contained in:
Kent Overstreet 2021-08-30 17:31:09 -04:00 committed by Kent Overstreet
parent 6fba6b83b4
commit deb0e573b4
4 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fs/bcachefs/btree_iter.c
View File

@ -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

2
fs/bcachefs/btree_iter.h
View File

@ -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);

2
fs/bcachefs/btree_key_cache.c
View File

@ -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)) {

5
fs/bcachefs/btree_types.h
View File

@ -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)