diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-11-16 09:12:15 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-11-16 09:12:15 -0500 |
| commit | 9a058f14283a3591a8b173a667d0b43a8b34c0ae (patch) | |
| tree | bb6449fec8400a73517b9e96c0de210269edb8ba /libbcachefs/btree_iter.h | |
| parent | 8d86f9c15da65965c53e5264433730b20c6f79f9 (diff) | |
Update bcachefs sources to 70b5fb5daf bcachefs: Fix error reporting from bch2_journal_flush_seq
Diffstat (limited to 'libbcachefs/btree_iter.h')
| -rw-r--r-- | libbcachefs/btree_iter.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libbcachefs/btree_iter.h b/libbcachefs/btree_iter.h index 2dc58828..33a703c2 100644 --- a/libbcachefs/btree_iter.h +++ b/libbcachefs/btree_iter.h @@ -140,9 +140,13 @@ inline struct bkey_s_c bch2_btree_path_peek_slot(struct btree_path *, struct bke #ifdef CONFIG_BCACHEFS_DEBUG void bch2_trans_verify_paths(struct btree_trans *); void bch2_trans_verify_locks(struct btree_trans *); +void bch2_assert_pos_locked(struct btree_trans *, enum btree_id, + struct bpos, bool); #else static inline void bch2_trans_verify_paths(struct btree_trans *trans) {} static inline void bch2_trans_verify_locks(struct btree_trans *trans) {} +static inline void bch2_assert_pos_locked(struct btree_trans *trans, enum btree_id id, + struct bpos pos, bool key_cache) {} #endif void bch2_btree_path_fix_key_modified(struct btree_trans *trans, @@ -227,8 +231,6 @@ static inline void bch2_btree_iter_set_pos(struct btree_iter *iter, struct bpos iter->k.p.offset = iter->pos.offset = new_pos.offset; iter->k.p.snapshot = iter->pos.snapshot = new_pos.snapshot; iter->k.size = 0; - if (iter->path->ref == 1) - iter->path->should_be_locked = false; } static inline void bch2_btree_iter_set_pos_to_extent_start(struct btree_iter *iter) |