diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2020-12-09 13:34:42 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-22 17:08:49 -0400 |
| commit | cc578a36f9953c32a8ba866ee1878fcbb99a9746 (patch) | |
| tree | 6042fc949d01fd118b791ed6029467c491e9fe45 /fs/bcachefs/btree_iter.h | |
| parent | d5b98fe2d764170e7a30eda8b94780aa6a0af129 (diff) | |
| download | lwn-cc578a36f9953c32a8ba866ee1878fcbb99a9746.tar.gz lwn-cc578a36f9953c32a8ba866ee1878fcbb99a9746.zip | |
bcachefs: Fix __btree_iter_next() when all iters are in use_next() when all iters are in use
Also, print out more information on btree transaction iterator overflow.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
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 | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/fs/bcachefs/btree_iter.h b/fs/bcachefs/btree_iter.h index ee8c4346aadb..9a7f8d0197ec 100644 --- a/fs/bcachefs/btree_iter.h +++ b/fs/bcachefs/btree_iter.h @@ -51,11 +51,17 @@ static inline int btree_iter_err(const struct btree_iter *iter) static inline struct btree_iter * __trans_next_iter(struct btree_trans *trans, unsigned idx) { - u64 l = trans->iters_linked >> idx; + u64 l; + + if (idx == BTREE_ITER_MAX) + return NULL; + + l = trans->iters_linked >> idx; if (!l) return NULL; idx += __ffs64(l); + EBUG_ON(idx >= BTREE_ITER_MAX); EBUG_ON(trans->iters[idx].idx != idx); return &trans->iters[idx]; } |