diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2017-12-13 16:01:18 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2017-12-13 16:12:38 -0500 |
| commit | ea83a3985d28372d56ec7cea6e73907551869f63 (patch) | |
| tree | 42b8b0d3da3b1fa96eb4400455559e60a78c4294 /libbcachefs/btree_types.h | |
| parent | f2feceddae6f3bd3722247f3458860b955f539bc (diff) | |
Update bcachefs sources to e57b5958cf bcachefs: fix for building in userspace
Diffstat (limited to 'libbcachefs/btree_types.h')
| -rw-r--r-- | libbcachefs/btree_types.h | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h index 8b4df034..f1e06a37 100644 --- a/libbcachefs/btree_types.h +++ b/libbcachefs/btree_types.h @@ -55,6 +55,16 @@ struct btree_write { struct closure_waitlist wait; }; +struct btree_ob_ref { + u8 nr; + u8 refs[BCH_REPLICAS_MAX]; +}; + +struct btree_alloc { + struct btree_ob_ref ob; + BKEY_PADDED(k); +}; + struct btree { /* Hottest entries first */ struct rhash_head hash; @@ -118,7 +128,7 @@ struct btree { */ struct btree_update *will_make_reachable; - struct open_bucket *ob; + struct btree_ob_ref ob; /* lru list */ struct list_head list; @@ -317,18 +327,6 @@ struct btree_root { struct btree_iter; struct btree_node_iter; -enum extent_insert_hook_ret { - BTREE_HOOK_DO_INSERT, - BTREE_HOOK_NO_INSERT, - BTREE_HOOK_RESTART_TRANS, -}; - -struct extent_insert_hook { - enum extent_insert_hook_ret - (*fn)(struct extent_insert_hook *, struct bpos, struct bpos, - struct bkey_s_c, const struct bkey_i *); -}; - enum btree_insert_ret { BTREE_INSERT_OK, /* extent spanned multiple leaf nodes: have to traverse to next node: */ @@ -342,6 +340,12 @@ enum btree_insert_ret { BTREE_INSERT_NEED_GC_LOCK, }; +struct extent_insert_hook { + enum btree_insert_ret + (*fn)(struct extent_insert_hook *, struct bpos, struct bpos, + struct bkey_s_c, const struct bkey_i *); +}; + enum btree_gc_coalesce_fail_reason { BTREE_GC_COALESCE_FAIL_RESERVE_GET, BTREE_GC_COALESCE_FAIL_KEYLIST_REALLOC, |