diff options
author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-05-01 01:04:43 +0300 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:10:00 +0300 |
commit | 95b595a5fc4832305fe1323d934bdcae5f2b9439 (patch) | |
tree | 54fa643d5f3ba515256a7486698fb259ccd94d91 /fs | |
parent | 0a23574ebb48844a19cf46672b28e7d439e56454 (diff) | |
download | linux-95b595a5fc4832305fe1323d934bdcae5f2b9439.tar.xz |
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>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/bcachefs/bkey_methods.h | 2 | ||||
-rw-r--r-- | fs/bcachefs/btree_types.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/fs/bcachefs/bkey_methods.h b/fs/bcachefs/bkey_methods.h index 346b3ceb136d..ec4638150eae 100644 --- 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 bc4aa26b9486..fc8a3326451f 100644 --- 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, |