diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-06-06 12:28:01 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:21 -0400 |
| commit | c43a6ef9a0747ef1094ff14e173513070ed91600 (patch) | |
| tree | d207064b67f5222cd7ce6a87557ef96101d13007 /fs/bcachefs/btree_update_leaf.c | |
| parent | 5e82a9a1f4f82e273530b90d107638a5969d1de0 (diff) | |
bcachefs: btree_bkey_cached_common
This is prep work for the btree key cache: btree iterators will point to
either struct btree, or a new struct bkey_cached.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_update_leaf.c')
| -rw-r--r-- | fs/bcachefs/btree_update_leaf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index 3425ad6f68b2..5e13ad34ec42 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -155,7 +155,7 @@ static void __btree_node_flush(struct journal *j, struct journal_entry_pin *pin, btree_node_lock_type(c, b, SIX_LOCK_read); bch2_btree_node_write_cond(c, b, (btree_current_write(b) == w && w->journal.seq == seq)); - six_unlock_read(&b->lock); + six_unlock_read(&b->c.lock); } static void btree_node_flush0(struct journal *j, struct journal_entry_pin *pin, u64 seq) @@ -198,7 +198,7 @@ void bch2_btree_journal_key(struct btree_trans *trans, struct btree *b = iter->l[0].b; struct btree_write *w = btree_current_write(b); - EBUG_ON(iter->level || b->level); + EBUG_ON(iter->level || b->c.level); EBUG_ON(trans->journal_res.ref != !(trans->flags & BTREE_INSERT_JOURNAL_REPLAY)); |