diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-03-04 23:05:55 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:09:55 -0400 |
| commit | ac2ccddc2689d5889fd1520383738b60dbafc1d0 (patch) | |
| tree | c090c0f7749633a7d03ba3790fc2f9ec1b396318 /fs/bcachefs/journal_io.h | |
| parent | 45dd05b3ecc371560f9e36e4b57295ee338ee879 (diff) | |
bcachefs: Drop some anonymous structs, unions
Rust bindgen doesn't cope well with anonymous structs and unions. This
patch drops the fancy anonymous structs & unions in bkey_i that let us
use the same helpers for bkey_i and bkey_packed; since bkey_packed is an
internal type that's never exposed to outside code, it's only a minor
inconvenienc.
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/journal_io.h')
| -rw-r--r-- | fs/bcachefs/journal_io.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/fs/bcachefs/journal_io.h b/fs/bcachefs/journal_io.h index a32c2876f2a6..8801e98104bd 100644 --- a/fs/bcachefs/journal_io.h +++ b/fs/bcachefs/journal_io.h @@ -40,9 +40,14 @@ static inline struct jset_entry *__jset_entry_type_next(struct jset *jset, (entry = __jset_entry_type_next(jset, entry, type)); \ entry = vstruct_next(entry)) -#define for_each_jset_key(k, _n, entry, jset) \ - for_each_jset_entry_type(entry, jset, BCH_JSET_ENTRY_btree_keys) \ - vstruct_for_each_safe(entry, k, _n) +#define jset_entry_for_each_key(_e, _k) \ + for (_k = (_e)->start; \ + _k < vstruct_last(_e); \ + _k = bkey_next(_k)) + +#define for_each_jset_key(k, entry, jset) \ + for_each_jset_entry_type(entry, jset, BCH_JSET_ENTRY_btree_keys)\ + jset_entry_for_each_key(entry, k) int bch2_journal_entry_validate(struct bch_fs *, struct jset *, struct jset_entry *, unsigned, int, int); |