diff options
author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-05-11 00:09:42 +0300 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:08:22 +0300 |
commit | b03b81dfd268938c6ed3b0ec79b4983523efb303 (patch) | |
tree | 21c54d3cb62ba203724a67d96c0dce7f90692410 /fs/bcachefs/btree_locking.h | |
parent | b7607ce98f286ed3d7181875f4b1f4a02663395c (diff) | |
download | linux-b03b81dfd268938c6ed3b0ec79b4983523efb303.tar.xz |
bcachefs: Don't pass around may_drop_locks
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_locking.h')
-rw-r--r-- | fs/bcachefs/btree_locking.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/bcachefs/btree_locking.h b/fs/bcachefs/btree_locking.h index e75e56c34f5f..33bc94a714c6 100644 --- a/fs/bcachefs/btree_locking.h +++ b/fs/bcachefs/btree_locking.h @@ -175,20 +175,18 @@ static inline bool btree_node_lock_increment(struct btree_iter *iter, } bool __bch2_btree_node_lock(struct btree *, struct bpos, unsigned, - struct btree_iter *, enum six_lock_type, bool); + struct btree_iter *, enum six_lock_type); static inline bool btree_node_lock(struct btree *b, struct bpos pos, unsigned level, struct btree_iter *iter, - enum six_lock_type type, - bool may_drop_locks) + enum six_lock_type type) { EBUG_ON(level >= BTREE_MAX_DEPTH); return likely(six_trylock_type(&b->c.lock, type)) || btree_node_lock_increment(iter, b, level, type) || - __bch2_btree_node_lock(b, pos, level, iter, - type, may_drop_locks); + __bch2_btree_node_lock(b, pos, level, iter, type); } bool __bch2_btree_node_relock(struct btree_iter *, unsigned); |