diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-13 19:14:01 -0400 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2022-03-13 19:20:59 -0400 |
| commit | d34e731082d8fcd710c2af6377a3b7fa927c8451 (patch) | |
| tree | 96a9a25295fcb570358e30ae04a16b2c7a7f7aa3 /libbcachefs/fs.c | |
| parent | bf7924f5526707e01213cad546794571764bc177 (diff) | |
Update bcachefs sources to e48731a188 bcachefs: Fix BTREE_TRIGGER_WANTS_OLD_AND_NEW
Diffstat (limited to 'libbcachefs/fs.c')
| -rw-r--r-- | libbcachefs/fs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbcachefs/fs.c b/libbcachefs/fs.c index 30720c1..9fc6c39 100644 --- a/libbcachefs/fs.c +++ b/libbcachefs/fs.c @@ -30,6 +30,7 @@ #include <linux/pagemap.h> #include <linux/posix_acl.h> #include <linux/random.h> +#include <linux/seq_file.h> #include <linux/statfs.h> #include <linux/string.h> #include <linux/xattr.h> @@ -934,9 +935,8 @@ retry: SPOS(ei->v.i_ino, start, snapshot), 0); while (!(ret = btree_trans_too_many_iters(&trans)) && - (k = bch2_btree_iter_peek(&iter)).k && - !(ret = bkey_err(k)) && - bkey_cmp(iter.pos, end) < 0) { + (k = bch2_btree_iter_peek_upto(&iter, end)).k && + !(ret = bkey_err(k))) { enum btree_id data_btree = BTREE_ID_extents; if (!bkey_extent_is_data(k.k) && |