Update bcachefs sources to ef60854e99 bcachefs: More allocator startup improvements

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

diff --git a/libbcachefs/bcachefs.h b/libbcachefs/bcachefs.h
index 3056f3bf4a4bf9fcd7355ec5d00c28fe4a9ce8f5..449eb0c1ce6116e682c38a0a64c8da622fd2e6d7 100644 (file)
--- a/libbcachefs/bcachefs.h
+++ b/libbcachefs/bcachefs.h
@@ -618,10 +618,11 @@ struct bch_fs {
 
        struct bch_fs_pcpu __percpu     *pcpu;
 
-       struct bch_fs_usage __percpu    *usage[2];
-
        struct percpu_rw_semaphore      mark_lock;
 
+       struct bch_fs_usage __percpu    *usage[2];
+       struct bch_fs_usage __percpu    *usage_scratch;
+
        /*
         * When we invalidate buckets, we use both the priority and the amount
         * of good data to determine which buckets to reuse first - to weight
@@ -685,7 +686,7 @@ struct bch_fs {
        ZSTD_parameters         zstd_params;
 
        struct crypto_shash     *sha256;
-       struct crypto_skcipher  *chacha20;
+       struct crypto_sync_skcipher *chacha20;
        struct crypto_shash     *poly1305;
 
        atomic64_t              key_version;