From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Fri, 19 Mar 2021 20:37:24 +0000 (-0400)
Subject: bcachefs: Don't overwrite snapshot field in bch2_cut_back()
X-Git-Tag: v6.7-rc1~201^2~1730
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d361a26d02b97e3f3c0e1563b62a5f7c32ef2f04;p=thirdparty%2Fkernel%2Flinux.git

bcachefs: Don't overwrite snapshot field in bch2_cut_back()

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

diff --git a/fs/bcachefs/extents.c b/fs/bcachefs/extents.c
index 76b2459d8e734..2be49f443eb01 100644
--- a/fs/bcachefs/extents.c
+++ b/fs/bcachefs/extents.c
@@ -1183,7 +1183,7 @@ int bch2_cut_back_s(struct bpos where, struct bkey_s k)
 
 	len = where.offset - bkey_start_offset(k.k);
 
-	k.k->p = where;
+	k.k->p.offset = where.offset;
 	k.k->size = len;
 
 	if (!len) {