diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-05-24 11:57:29 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-05-24 11:58:42 -0400 |
| commit | 7e3538959966b80be3d4cfcb7076c8ab40a4be11 (patch) | |
| tree | e2fd15c236465eed0d595dafc06c7d4a208f7c7a /libbcachefs/btree_types.h | |
| parent | 93bdfcb2105afe7a45d512984b855ce97937cfc1 (diff) | |
Update bcachefs sources to f38382c574 bcachefs: Improve key marking interface
Diffstat (limited to 'libbcachefs/btree_types.h')
| -rw-r--r-- | libbcachefs/btree_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h index 57ef5014..f2641d56 100644 --- a/libbcachefs/btree_types.h +++ b/libbcachefs/btree_types.h @@ -193,7 +193,6 @@ enum btree_iter_type { */ #define BTREE_ITER_IS_EXTENTS (1 << 4) #define BTREE_ITER_ERROR (1 << 5) -#define BTREE_ITER_NOUNLOCK (1 << 6) enum btree_iter_uptodate { BTREE_ITER_UPTODATE = 0, @@ -269,7 +268,6 @@ struct btree_insert_entry { struct btree_trans { struct bch_fs *c; unsigned long ip; - size_t nr_restarts; u64 commit_start; u64 iters_linked; @@ -283,6 +281,7 @@ struct btree_trans { u8 size; unsigned used_mempool:1; unsigned error:1; + unsigned nounlock:1; unsigned mem_top; unsigned mem_bytes; @@ -297,11 +296,12 @@ struct btree_trans { u64 *journal_seq; struct disk_reservation *disk_res; unsigned flags; + unsigned journal_u64s; struct btree_iter iters_onstack[2]; struct btree_insert_entry updates_onstack[6]; - struct replicas_delta_list fs_usage_deltas; + struct replicas_delta_list *fs_usage_deltas; }; #define BTREE_FLAG(flag) \ |