From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Wed, 21 Aug 2019 22:55:07 +0000 (-0400)
Subject: bcachefs: Fix bch2_bkey_narrow_crcs()
X-Git-Tag: v6.7-rc1~201^2~2381
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f698a957979bfff266a65a2080a224cca7ccc962;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Fix bch2_bkey_narrow_crcs()

We have to reinitialize ptrs whenever we do something that changes them.
Regression from when the code was converted to be generic across all
keys with pointers.

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

diff --git a/fs/bcachefs/extents.c b/fs/bcachefs/extents.c
index 779ee42350ad9..f097bed684e5c 100644
--- a/fs/bcachefs/extents.c
+++ b/fs/bcachefs/extents.c
@@ -454,6 +454,8 @@ found:
 	BUG_ON(n.live_size != k->k.size);
 
 restart_narrow_pointers:
+	ptrs = bch2_bkey_ptrs(bkey_i_to_s(k));
+
 	bkey_for_each_ptr_decode(&k->k, ptrs, p, i)
 		if (can_narrow_crc(p.crc, n)) {
 			bch2_bkey_drop_ptr(bkey_i_to_s(k), &i->ptr);