diff options
Diffstat (limited to 'libbcachefs/bcachefs.h')
| -rw-r--r-- | libbcachefs/bcachefs.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libbcachefs/bcachefs.h b/libbcachefs/bcachefs.h index 6259b50e..977ac364 100644 --- a/libbcachefs/bcachefs.h +++ b/libbcachefs/bcachefs.h @@ -240,8 +240,6 @@ do { \ "btree node it traverses") \ BCH_DEBUG_PARAM(btree_gc_rewrite_disabled, \ "Disables rewriting of btree nodes during mark and sweep")\ - BCH_DEBUG_PARAM(btree_gc_coalesce_disabled, \ - "Disables coalescing of btree nodes") \ BCH_DEBUG_PARAM(btree_shrinker_disabled, \ "Disables the shrinker callback for the btree node cache") @@ -273,7 +271,6 @@ do { \ #define BCH_TIME_STATS() \ BCH_TIME_STAT(btree_node_mem_alloc, sec, us) \ BCH_TIME_STAT(btree_gc, sec, ms) \ - BCH_TIME_STAT(btree_coalesce, sec, ms) \ BCH_TIME_STAT(btree_split, sec, us) \ BCH_TIME_STAT(btree_sort, ms, us) \ BCH_TIME_STAT(btree_read, ms, us) \ @@ -417,8 +414,9 @@ struct bch_dev { atomic_long_t saturated_count; size_t inc_gen_needs_gc; + size_t inc_gen_really_needs_gc; - bucket_heap alloc_heap; + alloc_heap alloc_heap; bucket_heap copygc_heap; /* Moving GC: */ @@ -681,6 +679,7 @@ struct bch_fs { /* GARBAGE COLLECTION */ struct task_struct *gc_thread; atomic_t kick_gc; + unsigned long gc_count; /* * Tracks GC's progress - everything in the range [ZERO_KEY..gc_cur_pos] @@ -716,7 +715,7 @@ struct bch_fs { mempool_t compression_bounce[2]; struct crypto_shash *sha256; - struct crypto_blkcipher *chacha20; + struct crypto_skcipher *chacha20; struct crypto_shash *poly1305; atomic64_t key_version; @@ -762,6 +761,7 @@ struct bch_fs { /* The rest of this all shows up in sysfs */ atomic_long_t read_realloc_races; + unsigned btree_gc_periodic:1; unsigned foreground_write_ratelimit_enabled:1; unsigned copy_gc_enabled:1; unsigned tiering_enabled:1; |