system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-03 18:00:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

bcachefs: fix more locking bugs

Browse source 
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
This commit is contained in:
Kent Overstreet 2019-02-13 15:17:23 -05:00 committed by Kent Overstreet
parent 8777210b92
commit 8c96cfccf0
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
fs/bcachefs/alloc_background.c
View file

@ -886,7 +886,8 @@ static int bch2_invalidate_buckets(struct bch_fs *c, struct bch_dev *ca)
ret = __bch2_alloc_write_key(c, ca, b, &iter,
must_flush ? &journal_seq : NULL,
BTREE_INSERT_GC_LOCK_HELD|
!fifo_empty(&ca->free_inc) ? BTREE_INSERT_NOWAIT : 0);
(!fifo_empty(&ca->free_inc)
? BTREE_INSERT_NOWAIT : 0));
}
bch2_btree_iter_unlock(&iter);

15
fs/bcachefs/btree_update_interior.c
View file

@ -1567,7 +1567,8 @@ int bch2_btree_split_leaf(struct bch_fs *c, struct btree_iter *iter,
closure_init_stack(&cl);
/* Hack, because gc and splitting nodes doesn't mix yet: */
if (!down_read_trylock(&c->gc_lock)) {
if (!(flags & BTREE_INSERT_GC_LOCK_HELD) &&
!down_read_trylock(&c->gc_lock)) {
if (flags & BTREE_INSERT_NOUNLOCK)
return -EINTR;
@ -1610,7 +1611,8 @@ int bch2_btree_split_leaf(struct bch_fs *c, struct btree_iter *iter,
*/
__bch2_btree_iter_downgrade(iter, 1);
out:
up_read(&c->gc_lock);
if (!(flags & BTREE_INSERT_GC_LOCK_HELD))
up_read(&c->gc_lock);
closure_sync(&cl);
return ret;
}
@ -1688,7 +1690,8 @@ void __bch2_foreground_maybe_merge(struct bch_fs *c,
}
/* We're changing btree topology, doesn't mix with gc: */
if (!down_read_trylock(&c->gc_lock))
if (!(flags & BTREE_INSERT_GC_LOCK_HELD) &&
!down_read_trylock(&c->gc_lock))
goto err_cycle_gc_lock;
if (!bch2_btree_iter_upgrade(iter, U8_MAX,
@ -1748,7 +1751,8 @@ void __bch2_foreground_maybe_merge(struct bch_fs *c,
bch2_btree_update_done(as);
up_read(&c->gc_lock);
if (!(flags & BTREE_INSERT_GC_LOCK_HELD))
up_read(&c->gc_lock);
out:
bch2_btree_iter_verify_locks(iter);
@ -1779,7 +1783,8 @@ void __bch2_foreground_maybe_merge(struct bch_fs *c,
err_unlock:
six_unlock_intent(&m->lock);
up_read(&c->gc_lock);
if (!(flags & BTREE_INSERT_GC_LOCK_HELD))
up_read(&c->gc_lock);
err:
BUG_ON(ret == -EAGAIN && (flags & BTREE_INSERT_NOUNLOCK));