diff options
author | Kent Overstreet <kent.overstreet@gmail.com> | 2019-04-17 15:49:45 -0400 |
---|---|---|
committer | Kent Overstreet <kent.overstreet@gmail.com> | 2019-04-17 15:51:14 -0400 |
commit | ac315cf19b8e6206e8dd59e5b5469b0d07dc2d47 (patch) | |
tree | a2764354f4fde4b499a1a867921dfebf8ae6b405 | |
parent | 17224941241a76ec818c4a64451d797252a98241 (diff) |
bcachefs: fix triggers for stripes btree
-rw-r--r-- | fs/bcachefs/buckets.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/fs/bcachefs/buckets.c b/fs/bcachefs/buckets.c index 5c36c82cf315..ac2a9cbbe783 100644 --- a/fs/bcachefs/buckets.c +++ b/fs/bcachefs/buckets.c @@ -1091,6 +1091,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; |