diff options
| author | Kent Overstreet <kent.overstreet@linux.dev> | 2023-04-30 13:02:05 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:10:00 -0400 |
| commit | ab158fce47220df20f0fe2360767227328f6765b (patch) | |
| tree | bc2c3485b5a1b2bf67388d9e3ff90bcec2d33c9c /fs/bcachefs/btree_iter.h | |
| parent | 95b595a5fc4832305fe1323d934bdcae5f2b9439 (diff) | |
| download | lwn-ab158fce47220df20f0fe2360767227328f6765b.tar.gz lwn-ab158fce47220df20f0fe2360767227328f6765b.zip | |
bcachefs: Converting to typed bkeys is now allowed for err, null ptrs
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/btree_iter.h')
| -rw-r--r-- | fs/bcachefs/btree_iter.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h index c3682332e653..4790472a3d0d 100644 --- a/fs/bcachefs/btree_iter.h +++ b/fs/bcachefs/btree_iter.h @@ -6,6 +6,13 @@ #include "btree_types.h" #include "trace.h" +static inline int __bkey_err(const struct bkey *k) +{ + return PTR_ERR_OR_ZERO(k); +} + +#define bkey_err(_k) __bkey_err((_k).k) + static inline void __btree_path_get(struct btree_path *path, bool intent) { path->ref++; @@ -539,11 +546,6 @@ u32 bch2_trans_begin(struct btree_trans *); __for_each_btree_node(_trans, _iter, _btree_id, _start, \ 0, 0, _flags, _b, _ret) -static inline int bkey_err(struct bkey_s_c k) -{ - return PTR_ERR_OR_ZERO(k.k); -} - static inline struct bkey_s_c bch2_btree_iter_peek_prev_type(struct btree_iter *iter, unsigned flags) { |