Delete more unused shim code, update bcache code

[bcachefs-tools-debian] / libbcache / buckets.h

diff --git a/libbcache/buckets.h b/libbcache/buckets.h
index 8194dd9b6baf8101a1a066c89677ee65eaf4d93f..9c6e438561fdb9b6995695b97c4fddcbbc0f0a4c 100644 (file)
--- a/libbcache/buckets.h
+++ b/libbcache/buckets.h
@@ -195,12 +195,12 @@ static inline u64 buckets_free_cache(struct cache *ca)
 
 struct bucket_stats_cache_set __bch_bucket_stats_read_cache_set(struct cache_set *);
 struct bucket_stats_cache_set bch_bucket_stats_read_cache_set(struct cache_set *);
-void bch_cache_set_stats_apply(struct cache_set *,
-                              struct bucket_stats_cache_set *,
-                              struct disk_reservation *,
+void bch_fs_stats_apply(struct cache_set *,
+                       struct bucket_stats_cache_set *,
+                       struct disk_reservation *,
                               struct gc_pos);
 
-static inline u64 __cache_set_sectors_used(struct cache_set *c)
+static inline u64 __bch_fs_sectors_used(struct cache_set *c)
 {
        struct bucket_stats_cache_set stats = __bch_bucket_stats_read_cache_set(c);
        u64 reserved = stats.persistent_reserved +
@@ -212,9 +212,9 @@ static inline u64 __cache_set_sectors_used(struct cache_set *c)
                (reserved >> 7);
 }
 
-static inline u64 cache_set_sectors_used(struct cache_set *c)
+static inline u64 bch_fs_sectors_used(struct cache_set *c)
 {
-       return min(c->capacity, __cache_set_sectors_used(c));
+       return min(c->capacity, __bch_fs_sectors_used(c));
 }
 
 /* XXX: kill? */