From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Sat, 12 Oct 2019 18:44:09 +0000 (-0400)
Subject: bcachefs: Fix iterator counting for reflink pointers (again)
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f38fe2dc5dbde967c96ce579f974a406a049b122;p=linux.git

bcachefs: Fix iterator counting for reflink pointers (again)

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

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;