Skip to content

Commit 672f752

Browse files
author
Kent Overstreet
committed
bcachefs: Fix accounting replay flags
BCH_TRANS_COMMIT_journal_reclaim without BCH_WATERMARK_reclaim means "return an error if low on journal space" - but accounting replay must succeed. Fixes koverstreet/bcachefs#656 Signed-off-by: Kent Overstreet <[email protected]>
1 parent c1bd21b commit 672f752

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

fs/bcachefs/recovery.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@ int bch2_journal_replay(struct bch_fs *c)
287287
BCH_TRANS_COMMIT_no_enospc|
288288
BCH_TRANS_COMMIT_journal_reclaim|
289289
BCH_TRANS_COMMIT_skip_accounting_apply|
290-
BCH_TRANS_COMMIT_no_journal_res,
290+
BCH_TRANS_COMMIT_no_journal_res|
291+
BCH_WATERMARK_reclaim,
291292
bch2_journal_replay_accounting_key(trans, k));
292293
if (bch2_fs_fatal_err_on(ret, c, "error replaying accounting; %s", bch2_err_str(ret)))
293294
goto err;

0 commit comments

Comments
 (0)