bcachefs: Btree iterator, update flags no longer conflict

Change btree_update_flags to start after the last btree iterator flag,
so that we can pass both in the same flags argument.

This is needed for the upcoming bch2_bkey_get_mut() helper.

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>

diff --git a/fs/bcachefs/bkey_methods.h b/fs/bcachefs/bkey_methods.h
index 346b3ceb136d36159deb1aa311fb616bad93640a..ec4638150eae94e4d90b3875e29d90256aa349f7 100644 (file)
--- a/fs/bcachefs/bkey_methods.h
+++ b/fs/bcachefs/bkey_methods.h
@@ -80,7 +80,7 @@ static inline int bch2_mark_key(struct btree_trans *trans,
 }
 
 enum btree_update_flags {
-       __BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE,
+       __BTREE_UPDATE_INTERNAL_SNAPSHOT_NODE = __BTREE_ITER_FLAGS_END,
        __BTREE_UPDATE_NOJOURNAL,
        __BTREE_UPDATE_KEY_CACHE_RECLAIM,
 

diff --git a/fs/bcachefs/btree_types.h b/fs/bcachefs/btree_types.h
index bc4aa26b9486d08db5aa1bc32c84e58e574c67e1..fc8a3326451fe0459707b8094c94f6075e4d16aa 100644 (file)
--- a/fs/bcachefs/btree_types.h
+++ b/fs/bcachefs/btree_types.h
@@ -211,6 +211,7 @@ 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,