From 201a4d4cbed532c73d83ea9ea8166f40e9faa1e1 Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 17 Apr 2019 15:49:45 -0400 Subject: [PATCH] bcachefs: fix triggers for stripes btree Signed-off-by: Kent Overstreet --- fs/bcachefs/buckets.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c index 7a05ba5fd5891..e9c5889b2c0fe 100644 --- a/fs/bcachefs/buckets.c +++ b/fs/bcachefs/buckets.c @@ -1107,6 +1107,15 @@ void bch2_mark_update(struct btree_trans *trans, if (unlikely(trans->flags & BTREE_INSERT_NOMARK_OVERWRITES)) return; + /* + * For non extents, we only mark the new key, not the key being + * overwritten - unless we're actually deleting: + */ + if ((iter->btree_id == BTREE_ID_ALLOC || + iter->btree_id == BTREE_ID_EC) && + !bkey_deleted(&insert->k->k)) + return; + while ((_k = bch2_btree_node_iter_peek_filter(&node_iter, b, KEY_TYPE_discard))) { struct bkey unpacked; -- 2.30.2