Update bcachefs sources to 940d6ca657 bcachefs: acl code improvements

[bcachefs-tools-debian] / libbcachefs / btree_locking.h

diff --git a/libbcachefs/btree_locking.h b/libbcachefs/btree_locking.h
index 1d975207a16353b5db507cec7070decf3e1fd9cf..419d0e815a2527d77cf3dcab10b35d1b5413cf9a 100644 (file)
--- a/libbcachefs/btree_locking.h
+++ b/libbcachefs/btree_locking.h
@@ -147,17 +147,19 @@ static inline void btree_node_lock_type(struct bch_fs *c, struct btree *b,
 }
 
 bool __bch2_btree_node_lock(struct btree *, struct bpos, unsigned,
-                          struct btree_iter *, enum six_lock_type);
+                           struct btree_iter *, enum six_lock_type, bool);
 
 static inline bool btree_node_lock(struct btree *b, struct bpos pos,
                                   unsigned level,
                                   struct btree_iter *iter,
-                                  enum six_lock_type type)
+                                  enum six_lock_type type,
+                                  bool may_drop_locks)
 {
        EBUG_ON(level >= BTREE_MAX_DEPTH);
 
        return likely(six_trylock_type(&b->lock, type)) ||
-               __bch2_btree_node_lock(b, pos, level, iter, type);
+               __bch2_btree_node_lock(b, pos, level, iter,
+                                      type, may_drop_locks);
 }
 
 bool __bch2_btree_node_relock(struct btree_iter *, unsigned);