diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-11-05 20:49:08 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:46 -0400 |
| commit | 7e7ae6ca57d210dcedc4268323c9471d97194111 (patch) | |
| tree | bcd34570a4b295cd718a1777de27902b1dc1bae8 /fs/bcachefs/btree_iter.h | |
| parent | 1a21bf9866700f29ad552cca8bbddfd248bb751c (diff) | |
| download | lwn-7e7ae6ca57d210dcedc4268323c9471d97194111.tar.gz lwn-7e7ae6ca57d210dcedc4268323c9471d97194111.zip | |
bcachefs: Fix spurious transaction restarts
The checks for lock ordering violations weren't quite right.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_iter.h')
| -rw-r--r-- | fs/bcachefs/btree_iter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h index f80e09255f68..f7a73619c85b 100644 --- a/fs/bcachefs/btree_iter.h +++ b/fs/bcachefs/btree_iter.h @@ -182,7 +182,7 @@ static inline int btree_iter_lock_cmp(const struct btree_iter *l, const struct btree_iter *r) { return cmp_int(l->btree_id, r->btree_id) ?: - -cmp_int(btree_iter_type(l), btree_iter_type(r)) ?: + -cmp_int(btree_iter_is_cached(l), btree_iter_is_cached(r)) ?: bkey_cmp(l->pos, r->pos); } |