diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-11 20:31:52 +0300 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@linux.dev> | 2023-10-23 00:09:27 +0300 |
| commit | 85d8cf161f98993f544c0b2c614873caf7b9c14f (patch) | |
| tree | bc6998212112729d53a479dfb3778d5316adf858 /fs/bcachefs/xattr.c | |
| parent | d4d24a6509548a6457f185fddd927df7d148464a (diff) | |
| download | linux-85d8cf161f98993f544c0b2c614873caf7b9c14f.tar.xz | |
bcachefs: bch2_btree_iter_peek_upto()
In BTREE_ITER_FILTER_SNAPHOTS mode, we skip over keys in unrelated
snapshots. When we hit the end of an inode, if the next inode(s) are in
a different subvolume, we could potentially have to skip past many keys
before finding a key we can return to the caller, so they can terminate
the iteration.
This adds a peek_upto() variant to solve this problem, to be used when
we know the range we're searching within.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Diffstat (limited to 'fs/bcachefs/xattr.c')
| -rw-r--r-- | fs/bcachefs/xattr.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/fs/bcachefs/xattr.c b/fs/bcachefs/xattr.c index 08b33ab8489f..ecce10342126 100644 --- a/fs/bcachefs/xattr.c +++ b/fs/bcachefs/xattr.c @@ -311,13 +311,9 @@ retry: if (ret) goto err; - for_each_btree_key_norestart(&trans, iter, BTREE_ID_xattrs, - SPOS(inum, offset, snapshot), 0, k, ret) { - BUG_ON(k.k->p.inode < inum); - - if (k.k->p.inode > inum) - break; - + for_each_btree_key_upto_norestart(&trans, iter, BTREE_ID_xattrs, + SPOS(inum, offset, snapshot), + POS(inum, U64_MAX), 0, k, ret) { if (k.k->type != KEY_TYPE_xattr) continue; |