diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-07-13 16:31:40 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-07-14 20:31:38 -0400 |
| commit | 86bd5c622c93509e204b6fb5de6910879fc87a70 (patch) | |
| tree | 5fea647ae71ccfe276da6de85d70e6b70c1af45a /libbcachefs/btree_cache.c | |
| parent | 700d013b5280b72a1fb3830d8f70ecce5decb0ab (diff) | |
Update bcachefs sources to 787de128a5 bcachefs: Improvements to fsck check_dirents()
Diffstat (limited to 'libbcachefs/btree_cache.c')
| -rw-r--r-- | libbcachefs/btree_cache.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libbcachefs/btree_cache.c b/libbcachefs/btree_cache.c index 73bfd01f..1aacd271 100644 --- a/libbcachefs/btree_cache.c +++ b/libbcachefs/btree_cache.c @@ -233,7 +233,7 @@ wait_on_io: if (bch2_verify_btree_ondisk) bch2_btree_node_write(c, b, SIX_LOCK_intent); else - __bch2_btree_node_write(c, b); + __bch2_btree_node_write(c, b, false); six_unlock_write(&b->c.lock); six_unlock_intent(&b->c.lock); @@ -691,7 +691,9 @@ static noinline struct btree *bch2_btree_node_fill(struct bch_fs *c, * currently fails for iterators that aren't pointed at a valid btree * node */ - if (iter && !bch2_trans_relock(iter->trans)) + if (iter && + (!bch2_trans_relock(iter->trans) || + !bch2_btree_iter_relock(iter, _THIS_IP_))) return ERR_PTR(-EINTR); if (!six_relock_type(&b->c.lock, lock_type, seq)) @@ -851,7 +853,9 @@ lock_node: * currently fails for iterators that aren't pointed at a valid * btree node */ - if (iter && !bch2_trans_relock(iter->trans)) + if (iter && + (!bch2_trans_relock(iter->trans) || + !bch2_btree_iter_relock(iter, _THIS_IP_))) return ERR_PTR(-EINTR); if (!six_relock_type(&b->c.lock, lock_type, seq)) @@ -1002,7 +1006,7 @@ wait_on_io: six_lock_write(&b->c.lock, NULL, NULL); if (btree_node_dirty(b)) { - __bch2_btree_node_write(c, b); + __bch2_btree_node_write(c, b, false); six_unlock_write(&b->c.lock); six_unlock_intent(&b->c.lock); goto wait_on_io; |