summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2022-04-08 23:54:14 -0400
committerKent Overstreet <kent.overstreet@linux.dev>2022-10-03 22:52:18 -0400
commite531b15fdfb5083267918559a635d7d03f2d048c (patch)
tree1f0a2f72a148495837d0926fb3e4ae90d6621e90
parent0742388d629cdf47abda445332cccacaddef836b (diff)
bcachefs: Don't skip triggers in fcollapse()
With backpointers this doesn't work anymore - backpointers always need to be updated to point to the new extent position. Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
-rw-r--r--fs/bcachefs/fs-io.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c
index 06b1fba3e586..e894f14585ae 100644
--- a/fs/bcachefs/fs-io.c
+++ b/fs/bcachefs/fs-io.c
@@ -2886,13 +2886,7 @@ reassemble:
next_pos = insert ? bkey_start_pos(&delete.k) : delete.k.p;
- if (copy.k->k.size == k.k->size) {
- /*
- * If we're moving the entire extent, we can skip
- * running triggers:
- */
- trigger_flags |= BTREE_TRIGGER_NORUN;
- } else {
+ if (copy.k->k.size != k.k->size) {
/* We might end up splitting compressed extents: */
unsigned nr_ptrs =
bch2_bkey_nr_ptrs_allocated(bkey_i_to_s_c(copy.k));