Update bcachefs sources to 938f680845d1 fixup! rename and export __kern_path_locked()

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

diff --git a/libbcachefs/btree_types.h b/libbcachefs/btree_types.h
index a3f24cd0043dbbf19783063db9cc45205ab53b79..e58575ad104542bf1d5f5f111a5bf1ee10255ba0 100644 (file)
--- a/libbcachefs/btree_types.h
+++ b/libbcachefs/btree_types.h
@@ -195,33 +195,32 @@ struct btree_node_iter {
  * Iterate over all possible positions, synthesizing deleted keys for holes:
  */
 static const __maybe_unused u16 BTREE_ITER_SLOTS               = 1 << 0;
-static const __maybe_unused u16 BTREE_ITER_ALL_LEVELS          = 1 << 1;
 /*
  * Indicates that intent locks should be taken on leaf nodes, because we expect
  * to be doing updates:
  */
-static const __maybe_unused u16 BTREE_ITER_INTENT              = 1 << 2;
+static const __maybe_unused u16 BTREE_ITER_INTENT              = 1 << 1;
 /*
  * Causes the btree iterator code to prefetch additional btree nodes from disk:
  */
-static const __maybe_unused u16 BTREE_ITER_PREFETCH            = 1 << 3;
+static const __maybe_unused u16 BTREE_ITER_PREFETCH            = 1 << 2;
 /*
  * Used in bch2_btree_iter_traverse(), to indicate whether we're searching for
  * @pos or the first key strictly greater than @pos
  */
-static const __maybe_unused u16 BTREE_ITER_IS_EXTENTS          = 1 << 4;
-static const __maybe_unused u16 BTREE_ITER_NOT_EXTENTS         = 1 << 5;
-static const __maybe_unused u16 BTREE_ITER_CACHED              = 1 << 6;
-static const __maybe_unused u16 BTREE_ITER_WITH_KEY_CACHE      = 1 << 7;
-static const __maybe_unused u16 BTREE_ITER_WITH_UPDATES                = 1 << 8;
-static const __maybe_unused u16 BTREE_ITER_WITH_JOURNAL                = 1 << 9;
-static const __maybe_unused u16 __BTREE_ITER_ALL_SNAPSHOTS     = 1 << 10;
-static const __maybe_unused u16 BTREE_ITER_ALL_SNAPSHOTS       = 1 << 11;
-static const __maybe_unused u16 BTREE_ITER_FILTER_SNAPSHOTS    = 1 << 12;
-static const __maybe_unused u16 BTREE_ITER_NOPRESERVE          = 1 << 13;
-static const __maybe_unused u16 BTREE_ITER_CACHED_NOFILL       = 1 << 14;
-static const __maybe_unused u16 BTREE_ITER_KEY_CACHE_FILL      = 1 << 15;
-#define __BTREE_ITER_FLAGS_END                                        16
+static const __maybe_unused u16 BTREE_ITER_IS_EXTENTS          = 1 << 3;
+static const __maybe_unused u16 BTREE_ITER_NOT_EXTENTS         = 1 << 4;
+static const __maybe_unused u16 BTREE_ITER_CACHED              = 1 << 5;
+static const __maybe_unused u16 BTREE_ITER_WITH_KEY_CACHE      = 1 << 6;
+static const __maybe_unused u16 BTREE_ITER_WITH_UPDATES                = 1 << 7;
+static const __maybe_unused u16 BTREE_ITER_WITH_JOURNAL                = 1 << 8;
+static const __maybe_unused u16 __BTREE_ITER_ALL_SNAPSHOTS     = 1 << 9;
+static const __maybe_unused u16 BTREE_ITER_ALL_SNAPSHOTS       = 1 << 10;
+static const __maybe_unused u16 BTREE_ITER_FILTER_SNAPSHOTS    = 1 << 11;
+static const __maybe_unused u16 BTREE_ITER_NOPRESERVE          = 1 << 12;
+static const __maybe_unused u16 BTREE_ITER_CACHED_NOFILL       = 1 << 13;
+static const __maybe_unused u16 BTREE_ITER_KEY_CACHE_FILL      = 1 << 14;
+#define __BTREE_ITER_FLAGS_END                                        15
 
 enum btree_path_uptodate {
        BTREE_ITER_UPTODATE             = 0,