summaryrefslogtreecommitdiff
path: root/libbcachefs/btree_types.h
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2019-12-16 14:42:09 -0500
committerKent Overstreet <kent.overstreet@gmail.com>2019-12-16 14:42:09 -0500
commit92d34f6ed29e90d48c40a4c31816df805edfe483 (patch)
tree01686f4d7c446156ee54a8eb5dce2132ef54993c /libbcachefs/btree_types.h
parentf574ca05f8b8284f28e61d5e788550bed15fc006 (diff)
Update bcachefs sources to fbb669e9de bcachefs: Kill btree_node_iter_large
Diffstat (limited to 'libbcachefs/btree_types.h')
-rw-r--r--libbcachefs/btree_types.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h
index efa68bb5..0c0a3f35 100644
--- a/libbcachefs/btree_types.h
+++ b/libbcachefs/btree_types.h
@@ -94,7 +94,6 @@ struct btree {
struct btree_nr_keys nr;
u16 sib_u64s[2];
u16 whiteout_u64s;
- u16 uncompacted_whiteout_u64s;
u8 page_order;
u8 unpack_fn_len;
@@ -421,6 +420,11 @@ static inline unsigned bset_u64s(struct bset_tree *t)
sizeof(struct bset) / sizeof(u64);
}
+static inline unsigned bset_dead_u64s(struct btree *b, struct bset_tree *t)
+{
+ return bset_u64s(t) - b->nr.bset_u64s[t - b->set];
+}
+
static inline unsigned bset_byte_offset(struct btree *b, void *i)
{
return i - (void *) b->data;