diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-05-10 17:09:42 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:22 -0400 |
| commit | b03b81dfd268938c6ed3b0ec79b4983523efb303 (patch) | |
| tree | 21c54d3cb62ba203724a67d96c0dce7f90692410 /fs/bcachefs/btree_iter.h | |
| parent | b7607ce98f286ed3d7181875f4b1f4a02663395c (diff) | |
bcachefs: Don't pass around may_drop_locks
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 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h index 9b7dfee2da82..b2c0b6816d1c 100644 --- a/fs/bcachefs/btree_iter.h +++ b/fs/bcachefs/btree_iter.h @@ -112,13 +112,12 @@ bool __bch2_btree_iter_upgrade(struct btree_iter *, unsigned); bool __bch2_btree_iter_upgrade_nounlock(struct btree_iter *, unsigned); static inline bool bch2_btree_iter_upgrade(struct btree_iter *iter, - unsigned new_locks_want, - bool may_drop_locks) + unsigned new_locks_want) { new_locks_want = min(new_locks_want, BTREE_MAX_DEPTH); return iter->locks_want < new_locks_want - ? (may_drop_locks + ? (!(iter->flags & BTREE_ITER_NOUNLOCK) ? __bch2_btree_iter_upgrade(iter, new_locks_want) : __bch2_btree_iter_upgrade_nounlock(iter, new_locks_want)) : iter->uptodate <= BTREE_ITER_NEED_PEEK; |