Commit 672f7523 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

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 https://github.com/koverstreet/bcachefs/issues/656



Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent c1bd21bb

fs/bcachefs/recovery.c

+2 −1
Original line number Diff line number Diff line
@@ -287,7 +287,8 @@ int bch2_journal_replay(struct bch_fs *c) 
				BCH_TRANS_COMMIT_no_enospc|

				BCH_TRANS_COMMIT_journal_reclaim|

				BCH_TRANS_COMMIT_skip_accounting_apply|

				BCH_TRANS_COMMIT_no_journal_res,

				BCH_TRANS_COMMIT_no_journal_res|

				BCH_WATERMARK_reclaim,

			     bch2_journal_replay_accounting_key(trans, k));

		if (bch2_fs_fatal_err_on(ret, c, "error replaying accounting; %s", bch2_err_str(ret)))

			goto err;