summaryrefslogtreecommitdiff
path: root/libbcachefs/btree_update_leaf.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2020-01-06 13:49:52 -0500
committerKent Overstreet <kent.overstreet@gmail.com>2020-01-06 13:49:52 -0500
commitab2f1ec24f5307b0cf1e3c4ad19bf350d9f54d9f (patch)
treef330335854e739590c3df1b322304c47ba0611f7 /libbcachefs/btree_update_leaf.c
parent304691592738dc272f4150107b54a53ab43fc8be (diff)
Update bcachefs sources to d763e8ab17 bcachefs: Don't lose needs_whiteout in overwrite path
Diffstat (limited to 'libbcachefs/btree_update_leaf.c')
-rw-r--r--libbcachefs/btree_update_leaf.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libbcachefs/btree_update_leaf.c b/libbcachefs/btree_update_leaf.c
index d05ed96c..dfbe5dcd 100644
--- a/libbcachefs/btree_update_leaf.c
+++ b/libbcachefs/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