diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-03-24 21:06:58 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-03-24 21:06:58 -0400 |
| commit | ddb58076ef4fe4572ab8537785fc67052f47bf5b (patch) | |
| tree | 57e0c770dab82d9cf7bb02e40dd1126701657958 /libbcachefs/btree_types.h | |
| parent | 0894d547501fb9306ae7b1c669b66a7b49fb2205 (diff) | |
Update bcachefs sources to ffe09df106 bcachefs: Verify fs hasn't been modified before going rw
Diffstat (limited to 'libbcachefs/btree_types.h')
| -rw-r--r-- | libbcachefs/btree_types.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h index a6aea023..d566722a 100644 --- a/libbcachefs/btree_types.h +++ b/libbcachefs/btree_types.h @@ -273,6 +273,7 @@ struct btree_insert_entry { struct btree_trans { struct bch_fs *c; size_t nr_restarts; + u64 commit_start; u64 iters_live; u64 iters_linked; @@ -289,6 +290,13 @@ struct btree_trans { struct btree_iter *iters; struct btree_insert_entry *updates; + /* update path: */ + struct journal_res journal_res; + struct journal_preres journal_preres; + u64 *journal_seq; + struct disk_reservation *disk_res; + unsigned flags; + struct btree_iter iters_onstack[2]; struct btree_insert_entry updates_onstack[6]; }; @@ -489,12 +497,11 @@ struct btree_root { enum btree_insert_ret { BTREE_INSERT_OK, - /* extent spanned multiple leaf nodes: have to traverse to next node: */ - BTREE_INSERT_NEED_TRAVERSE, /* leaf node needs to be split */ BTREE_INSERT_BTREE_NODE_FULL, BTREE_INSERT_ENOSPC, BTREE_INSERT_NEED_MARK_REPLICAS, + BTREE_INSERT_NEED_JOURNAL_RES, }; enum btree_gc_coalesce_fail_reason { |