diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-05-10 17:15:30 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2020-06-09 19:26:40 -0400 |
| commit | 30d80f36817fe53cfd47a7a0eb69a924d4e0f812 (patch) | |
| tree | 69d54ab16b0cbefa864865809790e86adce5c4b5 /fs/bcachefs/btree_iter.h | |
| parent | 41468767d11a27e31278b0f999eaa3dc8cc3cfb3 (diff) | |
bcachefs: kill BTREE_ITER_NOUNLOCK
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
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 c74c30ffe388..c8e80e3702ac 100644 --- a/fs/bcachefs/btree_iter.h +++ b/fs/bcachefs/btree_iter.h @@ -112,7 +112,7 @@ static inline bool bch2_btree_iter_upgrade(struct btree_iter *iter, new_locks_want = min(new_locks_want, BTREE_MAX_DEPTH); return iter->locks_want < new_locks_want - ? (!(iter->flags & BTREE_ITER_NOUNLOCK) + ? (!iter->trans->nounlock ? __bch2_btree_iter_upgrade(iter, new_locks_want) : __bch2_btree_iter_upgrade_nounlock(iter, new_locks_want)) : iter->uptodate <= BTREE_ITER_NEED_PEEK; |