Update bcachefs sources to ed2a5f4260 bcachefs: Add a missing bch2_btree_path_travers...

[bcachefs-tools-debian] / libbcachefs / btree_types.h

diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h
index 07c509aaa4ef399bf07d3119eac84a61965c4fbb..13a930251ab3d767ea9f9536e0b8daf1d3e22dc1 100644 (file)
--- a/libbcachefs/btree_types.h
+++ b/libbcachefs/btree_types.h
@@ -233,7 +233,7 @@ struct btree_path {
        /* btree_iter_copy starts here: */
        struct bpos             pos;
 
-       enum btree_id           btree_id:4;
+       enum btree_id           btree_id:5;
        bool                    cached:1;
        bool                    preserve:1;
        enum btree_path_uptodate uptodate:2;
@@ -243,7 +243,7 @@ struct btree_path {
         */
        bool                    should_be_locked:1;
        unsigned                level:3,
-                               locks_want:4;
+                               locks_want:3;
        u8                      nodes_locked;
 
        struct btree_path_level {
@@ -277,7 +277,7 @@ struct btree_iter {
        struct btree_path       *update_path;
        struct btree_path       *key_cache_path;
 
-       enum btree_id           btree_id:4;
+       enum btree_id           btree_id:8;
        unsigned                min_depth:3;
        unsigned                advanced:1;
 
@@ -702,15 +702,6 @@ struct btree_root {
        s8                      error;
 };
 
-enum btree_insert_ret {
-       BTREE_INSERT_OK,
-       /* leaf node needs to be split */
-       BTREE_INSERT_BTREE_NODE_FULL,
-       BTREE_INSERT_NEED_MARK_REPLICAS,
-       BTREE_INSERT_NEED_JOURNAL_RES,
-       BTREE_INSERT_NEED_JOURNAL_RECLAIM,
-};
-
 enum btree_gc_coalesce_fail_reason {
        BTREE_GC_COALESCE_FAIL_RESERVE_GET,
        BTREE_GC_COALESCE_FAIL_KEYLIST_REALLOC,