From f38fe2dc5dbde967c96ce579f974a406a049b122 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Sat, 12 Oct 2019 14:44:09 -0400 Subject: [PATCH] bcachefs: Fix iterator counting for reflink pointers (again) Signed-off-by: Kent Overstreet --- fs/bcachefs/extents.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/bcachefs/extents.c b/fs/bcachefs/extents.c index 50cad6725c1b6..8b7d2b8759b0e 100644 --- a/fs/bcachefs/extents.c +++ b/fs/bcachefs/extents.c @@ -959,7 +959,8 @@ static int count_iters_for_insert(struct btree_trans *trans, case KEY_TYPE_reflink_p: { struct bkey_s_c_reflink_p p = bkey_s_c_to_reflink_p(k); u64 idx = le64_to_cpu(p.v->idx); - unsigned sectors = end->offset - bkey_start_offset(p.k); + unsigned sectors = bpos_min(*end, p.k->p).offset - + bkey_start_offset(p.k); struct btree_iter *iter; struct bkey_s_c r_k; -- 2.30.2