From: Kent Overstreet <kent.overstreet@gmail.com>
Date: Sun, 5 Jan 2020 23:20:23 +0000 (-0500)
Subject: bcachefs: Don't lose needs_whiteout in overwrite path
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f2e8c69fcb63d280d1013b84973889e3aecd6603;p=linux.git

bcachefs: Don't lose needs_whiteout in overwrite path

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

diff --git a/fs/bcachefs/btree_update_leaf.c b/fs/bcachefs/btree_update_leaf.c
index 9ad2e3e90d5bb..3dc6b35b2e6ac 100644
--- a/fs/bcachefs/btree_update_leaf.c
+++ b/fs/bcachefs/btree_update_leaf.c
@@ -99,13 +99,14 @@ bool bch2_btree_bset_insert_key(struct btree_iter *iter,
 
 		}
 
+		insert->k.needs_whiteout = k->needs_whiteout;
+		k->needs_whiteout = false;
+
 		if (k >= btree_bset_last(b)->start) {
 			clobber_u64s = k->u64s;
 			goto overwrite;
 		}
 
-		insert->k.needs_whiteout = k->needs_whiteout;
-		k->needs_whiteout = false;
 		k->type = KEY_TYPE_deleted;
 		/*
 		 * XXX: we should be able to do this without two calls to