summaryrefslogtreecommitdiffstats
path: root/fs/bcachefs/journal_io.c
diff options
context:
space:
mode:
authorKent Overstreet <kent.overstreet@gmail.com>2019-03-30 00:49:17 +0100
committerKent Overstreet <kent.overstreet@linux.dev>2023-10-22 23:08:19 +0200
commit36e916e13b694e18d2928d0bda54fb5805051129 (patch)
tree921229be2745d2b0c17495fbe1d01fb09029d84a /fs/bcachefs/journal_io.c
parentbcachefs: Refactor bch2_fs_recovery() (diff)
downloadlinux-36e916e13b694e18d2928d0bda54fb5805051129.tar.xz
linux-36e916e13b694e18d2928d0bda54fb5805051129.zip
bcachefs: Caller now responsible for calling mark_key for gc
Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
Diffstat (limited to 'fs/bcachefs/journal_io.c')
-rw-r--r--fs/bcachefs/journal_io.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/bcachefs/journal_io.c b/fs/bcachefs/journal_io.c
index 1bb627c05188..1293bb66e62c 100644
--- a/fs/bcachefs/journal_io.c
+++ b/fs/bcachefs/journal_io.c
@@ -876,8 +876,9 @@ static int bch2_extent_replay_key(struct bch_fs *c, struct bkey_i *k)
* but - there are other correctness issues if btree gc were to run
* before journal replay finishes
*/
+ BUG_ON(c->gc_pos.phase);
+
bch2_mark_key(c, bkey_i_to_s_c(k), false, -((s64) k->k.size),
- gc_pos_btree_node(iter->l[0].b),
NULL, 0, 0);
bch2_trans_exit(&trans);