diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2022-09-03 22:24:16 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2022-10-03 23:54:01 -0400 |
| commit | a9a91c060724548758cf381cf8a74b4751421c53 (patch) | |
| tree | aa48e28e589b6cd7faf356579e48a1a4a48238cd | |
| parent | 3faf0ea72956d78d442a160961fb06c73d9ff99e (diff) | |
bcachefs: Ensure intent locks are marked before taking write locks
Locks must be correctly marked for the cycle detector to work.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
| -rw-r--r-- | fs/bcachefs/btree_key_cache.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c index 69122e95ca9f..fdb210093069 100644 --- a/fs/bcachefs/btree_key_cache.c +++ b/fs/bcachefs/btree_key_cache.c @@ -214,9 +214,13 @@ bkey_cached_alloc(struct btree_trans *trans, struct btree_path *path) return ERR_PTR(ret); } - ret = btree_node_lock_nopath(trans, &ck->c, SIX_LOCK_write); + path->l[0].b = (void *) ck; + path->l[0].lock_seq = ck->c.lock.state.seq; + mark_btree_node_locked(trans, path, 0, SIX_LOCK_intent); + + ret = bch2_btree_node_lock_write(trans, path, &ck->c); if (unlikely(ret)) { - six_unlock_intent(&ck->c.lock); + btree_node_unlock(trans, path, 0); bkey_cached_move_to_freelist(bc, ck); return ERR_PTR(ret); } @@ -284,6 +288,7 @@ btree_key_cache_create(struct btree_trans *trans, struct btree_path *path) return ERR_PTR(-ENOMEM); } + mark_btree_node_locked(trans, path, 0, SIX_LOCK_intent); was_new = false; } else { if (path->btree_id == BTREE_ID_subvolumes) @@ -305,6 +310,7 @@ btree_key_cache_create(struct btree_trans *trans, struct btree_path *path) if (likely(was_new)) { six_unlock_write(&ck->c.lock); six_unlock_intent(&ck->c.lock); + mark_btree_node_locked(trans, path, 0, BTREE_NODE_UNLOCKED); kfree(ck); } else { bkey_cached_free_fast(bc, ck); |