diff options
| author | Kent Overstreet <kent.overstreet@gmail.com> | 2021-01-08 10:56:39 -0500 |
|---|---|---|
| committer | Kent Overstreet <kent.overstreet@gmail.com> | 2021-01-08 11:06:27 -0500 |
| commit | bec5f37939b46b2841439dd2fa7ffaacb94bbda2 (patch) | |
| tree | 795282b7a2aed24408bf1a8767bde502a87965fe | |
| parent | d29935f50733fe904328a5d8051cd6ba992a15e5 (diff) | |
bcachefs: Fix btree node split after merge operations
A btree node merge operation deletes a key in the parent node; if when
inserting into the parent node we split the parent node, we can end up
with a whiteout in the parent node that we don't want.
The existing code drops them before doing the split, because they can
screw up picking the pivot, but we forgot about the unwritten writeouts
area - that needs to be cleared out too.
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
| -rw-r--r-- | fs/bcachefs/btree_update_interior.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/fs/bcachefs/btree_update_interior.c b/fs/bcachefs/btree_update_interior.c index 36bb1d8d164e..5bb653298c6c 100644 --- a/fs/bcachefs/btree_update_interior.c +++ b/fs/bcachefs/btree_update_interior.c @@ -1227,6 +1227,9 @@ static void btree_split_insert_keys(struct btree_update *as, struct btree *b, src = n; } + /* Also clear out the unwritten whiteouts area: */ + b->whiteout_u64s = 0; + i->u64s = cpu_to_le16((u64 *) dst - i->_data); set_btree_bset_end(b, b->set); |