Commit d108efc2 authored by Kent Overstreet's avatar Kent Overstreet Committed by Kent Overstreet

bcachefs: add const annotations to bset.c

perhaps a bit silly, but some debug assertions we want to add need const
propagated a bit more.
Signed-off-by: default avatarKent Overstreet <kent.overstreet@gmail.com>
Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent ae1ede58
...@@ -357,10 +357,10 @@ static struct bkey_float *bkey_float(const struct btree *b, ...@@ -357,10 +357,10 @@ static struct bkey_float *bkey_float(const struct btree *b,
return ro_aux_tree_base(b, t)->f + idx; return ro_aux_tree_base(b, t)->f + idx;
} }
static void bset_aux_tree_verify(struct btree *b) static void bset_aux_tree_verify(const struct btree *b)
{ {
#ifdef CONFIG_BCACHEFS_DEBUG #ifdef CONFIG_BCACHEFS_DEBUG
struct bset_tree *t; const struct bset_tree *t;
for_each_bset(b, t) { for_each_bset(b, t) {
if (t->aux_data_offset == U16_MAX) if (t->aux_data_offset == U16_MAX)
...@@ -696,20 +696,20 @@ static void make_bfloat(struct btree *b, struct bset_tree *t, ...@@ -696,20 +696,20 @@ static void make_bfloat(struct btree *b, struct bset_tree *t,
} }
/* bytes remaining - only valid for last bset: */ /* bytes remaining - only valid for last bset: */
static unsigned __bset_tree_capacity(struct btree *b, struct bset_tree *t) static unsigned __bset_tree_capacity(const struct btree *b, const struct bset_tree *t)
{ {
bset_aux_tree_verify(b); bset_aux_tree_verify(b);
return btree_aux_data_bytes(b) - t->aux_data_offset * sizeof(u64); return btree_aux_data_bytes(b) - t->aux_data_offset * sizeof(u64);
} }
static unsigned bset_ro_tree_capacity(struct btree *b, struct bset_tree *t) static unsigned bset_ro_tree_capacity(const struct btree *b, const struct bset_tree *t)
{ {
return __bset_tree_capacity(b, t) / return __bset_tree_capacity(b, t) /
(sizeof(struct bkey_float) + sizeof(u8)); (sizeof(struct bkey_float) + sizeof(u8));
} }
static unsigned bset_rw_tree_capacity(struct btree *b, struct bset_tree *t) static unsigned bset_rw_tree_capacity(const struct btree *b, const struct bset_tree *t)
{ {
return __bset_tree_capacity(b, t) / sizeof(struct rw_aux_tree); return __bset_tree_capacity(b, t) / sizeof(struct rw_aux_tree);
} }
...@@ -1213,8 +1213,8 @@ static inline bool bkey_mantissa_bits_dropped(const struct btree *b, ...@@ -1213,8 +1213,8 @@ static inline bool bkey_mantissa_bits_dropped(const struct btree *b,
__flatten __flatten
static struct bkey_packed *bset_search_tree(const struct btree *b, static struct bkey_packed *bset_search_tree(const struct btree *b,
struct bset_tree *t, const struct bset_tree *t,
struct bpos *search, const struct bpos *search,
const struct bkey_packed *packed_search) const struct bkey_packed *packed_search)
{ {
struct ro_aux_tree *base = ro_aux_tree_base(b, t); struct ro_aux_tree *base = ro_aux_tree_base(b, t);
......
...@@ -190,17 +190,17 @@ static inline enum bset_aux_tree_type bset_aux_tree_type(const struct bset_tree ...@@ -190,17 +190,17 @@ static inline enum bset_aux_tree_type bset_aux_tree_type(const struct bset_tree
#define BSET_CACHELINE 128 #define BSET_CACHELINE 128
static inline size_t btree_keys_cachelines(struct btree *b) static inline size_t btree_keys_cachelines(const struct btree *b)
{ {
return (1U << b->byte_order) / BSET_CACHELINE; return (1U << b->byte_order) / BSET_CACHELINE;
} }
static inline size_t btree_aux_data_bytes(struct btree *b) static inline size_t btree_aux_data_bytes(const struct btree *b)
{ {
return btree_keys_cachelines(b) * 8; return btree_keys_cachelines(b) * 8;
} }
static inline size_t btree_aux_data_u64s(struct btree *b) static inline size_t btree_aux_data_u64s(const struct btree *b)
{ {
return btree_aux_data_bytes(b) / sizeof(u64); return btree_aux_data_bytes(b) / sizeof(u64);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment