diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-02-11 19:04:40 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:15 -0400 |
| commit | 053dbb377dd2874942a1ca8517d454f35916a782 (patch) | |
| tree | 018e9b0f733c7bb8129a6a47127efbf75b22fb0a /fs | |
| parent | 66393392533048b7e45a202f349974d16c4c9ea3 (diff) | |
bcachefs: Fix a locking bug
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/bcachefs/alloc_background.c | 1 | ||||
| -rw-r--r-- | fs/bcachefs/btree_update_leaf.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/fs/bcachefs/alloc_background.c b/fs/bcachefs/alloc_background.c index c44e0417af87..34c1de63e43b 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 e052a3debadb..d1a2ac48ed29 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) |