From: Kent Overstreet Date: Tue, 12 Feb 2019 00:04:40 +0000 (-0500) Subject: bcachefs: Fix a locking bug X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=053dbb377dd2874942a1ca8517d454f35916a782;p=linux.git bcachefs: Fix a locking bug Signed-off-by: Kent Overstreet --- diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c index c44e0417af87c..34c1de63e43b8 100644 --- a/fs/bcachefs/alloc_background.c +++ b/fs/bcachefs/alloc_background.c @@ -883,6 +883,7 @@ 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); } diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c index e052a3debadb4..d1a2ac48ed29b 100644 --- a/fs/bcachefs/btree_update_leaf.c +++ b/fs/bcachefs/btree_update_leaf.c @@ -624,6 +624,9 @@ int __bch2_btree_insert_at(struct btree_insert *trans) /* for the sake of sanity: */ BUG_ON(trans->nr > 1 && !(trans->flags & BTREE_INSERT_ATOMIC)); + if (trans->flags & BTREE_INSERT_GC_LOCK_HELD) + lockdep_assert_held(&c->gc_lock); + bubble_sort(trans->entries, trans->nr, btree_trans_cmp); trans_for_each_entry(trans, i)