summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@linux.dev>2023-11-07 11:16:14 -0500
committerKent Overstreet <kent.overstreet@linux.dev>2023-11-12 00:36:06 -0500
commit1bbf70db344cd5dde90287f3d75031ca2544e19f (patch)
tree8384c4d02de5ddce6ff0609af5c074ee3cf5c15b
parentec883cbb85bf83740a3afbeae2e83f0bb1231e35 (diff)
bcachefs: Clear k->needs_whitout earlier in commit path
The upcoming btree write buffer rework is going to use the journal itself as the first stage of the write buffer; this is a cleanup to make sure k->needs_whiteout is initialized before keys hit the journal. Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
-rw-r--r--fs/bcachefs/btree_trans_commit.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/bcachefs/btree_trans_commit.c b/fs/bcachefs/btree_trans_commit.c
index b9e8db264c26..3152f6abf73f 100644
--- a/fs/bcachefs/btree_trans_commit.c
+++ b/fs/bcachefs/btree_trans_commit.c
@@ -656,6 +656,8 @@ bch2_trans_commit_write_locked(struct btree_trans *trans, unsigned flags,
*stopped_at = i;
return ret;
}
+
+ i->k->k.needs_whiteout = false;
}
if (trans->nr_wb_updates &&
@@ -778,8 +780,6 @@ bch2_trans_commit_write_locked(struct btree_trans *trans, unsigned flags,
}
trans_for_each_update(trans, i) {
- i->k->k.needs_whiteout = false;
-
if (!i->cached) {
u64 seq = trans->journal_res.seq;