Update bcachefs sources to 717b356d1d bcachefs: Convert journal validation to bkey_in...

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

diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h
index ad73cd2e81475dea677a62f0617ab74c996a223d..6b6333df88f2efb701ad409058cb4b164a2acb21 100644 (file)
--- a/libbcachefs/btree_types.h
+++ b/libbcachefs/btree_types.h
@@ -194,33 +194,34 @@ struct btree_node_iter {
 /*
  * Iterate over all possible positions, synthesizing deleted keys for holes:
  */
-#define BTREE_ITER_SLOTS               (1 << 0)
-#define BTREE_ITER_ALL_LEVELS          (1 << 1)
+static const u16 BTREE_ITER_SLOTS              = 1 << 0;
+static const u16 BTREE_ITER_ALL_LEVELS         = 1 << 1;
 /*
  * Indicates that intent locks should be taken on leaf nodes, because we expect
  * to be doing updates:
  */
-#define BTREE_ITER_INTENT              (1 << 2)
+static const u16 BTREE_ITER_INTENT             = 1 << 2;
 /*
  * Causes the btree iterator code to prefetch additional btree nodes from disk:
  */
-#define BTREE_ITER_PREFETCH            (1 << 3)
+static const u16 BTREE_ITER_PREFETCH           = 1 << 3;
 /*
  * Used in bch2_btree_iter_traverse(), to indicate whether we're searching for
  * @pos or the first key strictly greater than @pos
  */
-#define BTREE_ITER_IS_EXTENTS          (1 << 4)
-#define BTREE_ITER_NOT_EXTENTS         (1 << 5)
-#define BTREE_ITER_CACHED              (1 << 6)
-#define BTREE_ITER_WITH_KEY_CACHE      (1 << 7)
-#define BTREE_ITER_WITH_UPDATES                (1 << 8)
-#define BTREE_ITER_WITH_JOURNAL                (1 << 9)
-#define __BTREE_ITER_ALL_SNAPSHOTS     (1 << 10)
-#define BTREE_ITER_ALL_SNAPSHOTS       (1 << 11)
-#define BTREE_ITER_FILTER_SNAPSHOTS    (1 << 12)
-#define BTREE_ITER_NOPRESERVE          (1 << 13)
-#define BTREE_ITER_CACHED_NOFILL       (1 << 14)
-#define BTREE_ITER_KEY_CACHE_FILL      (1 << 15)
+static const u16 BTREE_ITER_IS_EXTENTS         = 1 << 4;
+static const u16 BTREE_ITER_NOT_EXTENTS                = 1 << 5;
+static const u16 BTREE_ITER_CACHED             = 1 << 6;
+static const u16 BTREE_ITER_WITH_KEY_CACHE     = 1 << 7;
+static const u16 BTREE_ITER_WITH_UPDATES       = 1 << 8;
+static const u16 BTREE_ITER_WITH_JOURNAL       = 1 << 9;
+static const u16 __BTREE_ITER_ALL_SNAPSHOTS    = 1 << 10;
+static const u16 BTREE_ITER_ALL_SNAPSHOTS      = 1 << 11;
+static const u16 BTREE_ITER_FILTER_SNAPSHOTS   = 1 << 12;
+static const u16 BTREE_ITER_NOPRESERVE         = 1 << 13;
+static const u16 BTREE_ITER_CACHED_NOFILL      = 1 << 14;
+static const u16 BTREE_ITER_KEY_CACHE_FILL     = 1 << 15;
+#define __BTREE_ITER_FLAGS_END                        16
 
 enum btree_path_uptodate {
        BTREE_ITER_UPTODATE             = 0,
@@ -389,17 +390,14 @@ struct btree_insert_entry {
        u8                      old_btree_u64s;
        struct bkey_i           *k;
        struct btree_path       *path;
+       u64                     seq;
        /* key being overwritten: */
        struct bkey             old_k;
        const struct bch_val    *old_v;
        unsigned long           ip_allocated;
 };
 
-#ifndef CONFIG_LOCKDEP
 #define BTREE_ITER_MAX         64
-#else
-#define BTREE_ITER_MAX         32
-#endif
 
 struct btree_trans_commit_hook;
 typedef int (btree_trans_commit_hook_fn)(struct btree_trans *, struct btree_trans_commit_hook *);
@@ -442,6 +440,7 @@ struct btree_trans {
        bool                    notrace_relock_fail:1;
        enum bch_errcode        restarted:16;
        u32                     restart_count;
+       unsigned long           last_begin_ip;
        unsigned long           last_restarted_ip;
        unsigned long           srcu_lock_time;
 
@@ -644,7 +643,7 @@ static inline unsigned bset_byte_offset(struct btree *b, void *i)
 }
 
 enum btree_node_type {
-#define x(kwd, val) BKEY_TYPE_##kwd = val,
+#define x(kwd, val, ...) BKEY_TYPE_##kwd = val,
        BCH_BTREE_IDS()
 #undef x
        BKEY_TYPE_btree,
@@ -663,56 +662,64 @@ static inline enum btree_node_type btree_node_type(struct btree *b)
 }
 
 #define BTREE_NODE_TYPE_HAS_TRANS_TRIGGERS             \
-       ((1U << BKEY_TYPE_extents)|                     \
-        (1U << BKEY_TYPE_alloc)|                       \
-        (1U << BKEY_TYPE_inodes)|                      \
-        (1U << BKEY_TYPE_stripes)|                     \
-        (1U << BKEY_TYPE_reflink)|                     \
-        (1U << BKEY_TYPE_btree))
+       (BIT(BKEY_TYPE_extents)|                        \
+        BIT(BKEY_TYPE_alloc)|                          \
+        BIT(BKEY_TYPE_inodes)|                         \
+        BIT(BKEY_TYPE_stripes)|                        \
+        BIT(BKEY_TYPE_reflink)|                        \
+        BIT(BKEY_TYPE_btree))
 
 #define BTREE_NODE_TYPE_HAS_MEM_TRIGGERS               \
-       ((1U << BKEY_TYPE_alloc)|                       \
-        (1U << BKEY_TYPE_inodes)|                      \
-        (1U << BKEY_TYPE_stripes)|                     \
-        (1U << BKEY_TYPE_snapshots))
+       (BIT(BKEY_TYPE_alloc)|                          \
+        BIT(BKEY_TYPE_inodes)|                         \
+        BIT(BKEY_TYPE_stripes)|                        \
+        BIT(BKEY_TYPE_snapshots))
 
 #define BTREE_NODE_TYPE_HAS_TRIGGERS                   \
        (BTREE_NODE_TYPE_HAS_TRANS_TRIGGERS|            \
         BTREE_NODE_TYPE_HAS_MEM_TRIGGERS)
 
-#define BTREE_ID_IS_EXTENTS                            \
-       ((1U << BTREE_ID_extents)|                      \
-        (1U << BTREE_ID_reflink)|                      \
-        (1U << BTREE_ID_freespace))
+static inline bool btree_node_type_needs_gc(enum btree_node_type type)
+{
+       return BTREE_NODE_TYPE_HAS_TRIGGERS & (1U << type);
+}
 
 static inline bool btree_node_type_is_extents(enum btree_node_type type)
 {
-       return (1U << type) & BTREE_ID_IS_EXTENTS;
-}
+       const unsigned mask = 0
+#define x(name, nr, flags, ...)        |((!!((flags) & BTREE_ID_EXTENTS)) << nr)
+       BCH_BTREE_IDS()
+#undef x
+       ;
 
-#define BTREE_ID_HAS_SNAPSHOTS                         \
-       ((1U << BTREE_ID_extents)|                      \
-        (1U << BTREE_ID_inodes)|                       \
-        (1U << BTREE_ID_dirents)|                      \
-        (1U << BTREE_ID_xattrs))
+       return (1U << type) & mask;
+}
 
-#define BTREE_ID_HAS_PTRS                              \
-       ((1U << BTREE_ID_extents)|                      \
-        (1U << BTREE_ID_reflink))
+static inline bool btree_id_is_extents(enum btree_id btree)
+{
+       return btree_node_type_is_extents((enum btree_node_type) btree);
+}
 
 static inline bool btree_type_has_snapshots(enum btree_id id)
 {
-       return (1 << id) & BTREE_ID_HAS_SNAPSHOTS;
+       const unsigned mask = 0
+#define x(name, nr, flags, ...)        |((!!((flags) & BTREE_ID_SNAPSHOTS)) << nr)
+       BCH_BTREE_IDS()
+#undef x
+       ;
+
+       return (1U << id) & mask;
 }
 
 static inline bool btree_type_has_ptrs(enum btree_id id)
 {
-       return (1 << id) & BTREE_ID_HAS_PTRS;
-}
+       const unsigned mask = 0
+#define x(name, nr, flags, ...)        |((!!((flags) & BTREE_ID_DATA)) << nr)
+       BCH_BTREE_IDS()
+#undef x
+       ;
 
-static inline bool btree_node_type_needs_gc(enum btree_node_type type)
-{
-       return BTREE_NODE_TYPE_HAS_TRIGGERS & (1U << type);
+       return (1U << id) & mask;
 }
 
 struct btree_root {