diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-09-15 11:15:18 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-05-30 18:16:43 -0400 |
| commit | f346676e49d014ba95b5926acf5da2a18763b036 (patch) | |
| tree | 289c16a96c7693e2431206d078b9548ad11eb6db /fs/bcachefs/btree_key_cache.c | |
| parent | 045de83ff45f990f3f988f541025761222bf455a (diff) | |
Revert "bcachefs: Add more assertions for locking btree iterators out of order"
Figured out the bug we were chasing, and it had nothing to do with
locking btree iterators/paths out of order.
This reverts commit ff08733dd298c969aec7c7828095458f73fd5374.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs/btree_key_cache.c')
| -rw-r--r-- | fs/bcachefs/btree_key_cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_key_cache.c b/fs/bcachefs/btree_key_cache.c index 938ced36af73..2dfa5040d045 100644 --- a/fs/bcachefs/btree_key_cache.c +++ b/fs/bcachefs/btree_key_cache.c @@ -296,7 +296,7 @@ retry: if (!ck) goto retry; - mark_btree_node_locked(trans, path, 0, SIX_LOCK_intent); + mark_btree_node_locked(path, 0, SIX_LOCK_intent); path->locks_want = 1; } else { enum six_lock_type lock_want = __btree_lock_want(path, 0); @@ -318,7 +318,7 @@ retry: goto retry; } - mark_btree_node_locked(trans, path, 0, lock_want); + mark_btree_node_locked(path, 0, lock_want); } path->l[0].lock_seq = ck->c.lock.state.seq; |