Update bcachefs sources to 1ff261b014 bcachefs: Fix CPU usage in journal read path

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

diff --git a/libbcachefs/btree_key_cache.h b/libbcachefs/btree_key_cache.h
index 02715cd258ab0e235557adb246d1639ab236b578..fd29c14c562654a1a5cca2493ed28b717be9eed8 100644 (file)
--- a/libbcachefs/btree_key_cache.h
+++ b/libbcachefs/btree_key_cache.h
@@ -16,27 +16,22 @@ static inline bool bch2_btree_key_cache_must_wait(struct bch_fs *c)
        size_t nr_keys = atomic_long_read(&c->btree_key_cache.nr_keys);
        size_t max_dirty = 4096 + (nr_keys * 3) / 4;
 
-       return nr_dirty > max_dirty &&
-               test_bit(JOURNAL_RECLAIM_STARTED, &c->journal.flags);
+       return nr_dirty > max_dirty;
 }
 
+int bch2_btree_key_cache_journal_flush(struct journal *,
+                               struct journal_entry_pin *, u64);
+
 struct bkey_cached *
 bch2_btree_key_cache_find(struct bch_fs *, enum btree_id, struct bpos);
 
-int bch2_btree_iter_traverse_cached(struct btree_iter *);
+int bch2_btree_path_traverse_cached(struct btree_trans *, struct btree_path *,
+                                   unsigned);
 
 bool bch2_btree_insert_key_cached(struct btree_trans *,
-                       struct btree_iter *, struct bkey_i *);
+                       struct btree_path *, struct bkey_i *);
 int bch2_btree_key_cache_flush(struct btree_trans *,
                               enum btree_id, struct bpos);
-#ifdef CONFIG_BCACHEFS_DEBUG
-void bch2_btree_key_cache_verify_clean(struct btree_trans *,
-                               enum btree_id, struct bpos);
-#else
-static inline void
-bch2_btree_key_cache_verify_clean(struct btree_trans *trans,
-                               enum btree_id id, struct bpos pos) {}
-#endif
 
 void bch2_fs_btree_key_cache_exit(struct btree_key_cache *);
 void bch2_fs_btree_key_cache_init_early(struct btree_key_cache *);