jbd2: don't start fast commit on aborted journal

harshadjs · tytso · commit 87a144f09380 · 2020-11-06T23:01:06.000-05:00
Fast commit should not be started if the journal is aborted. Signed-off-by: Harshad Shirwadkar<harshadshirwadkar@gmail.com> Link: https://lore.kernel.org/r/20201106035911.1942128-22-harshadshirwadkar@gmail.com Signed-off-by: Theodore Ts'o <tytso@mit.edu>
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
@@ -727,6 +727,8 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid)
  */
 int jbd2_fc_begin_commit(journal_t *journal, tid_t tid)
 {
+	if (unlikely(is_journal_aborted(journal)))
+		return -EIO;
 	/*
 	 * Fast commits only allowed if at least one full commit has
 	 * been processed.

Original file line number	Diff line number	Diff line change
`@@ -727,6 +727,8 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid)`
`727`	`727`	`*/`
`728`	`728`	`int jbd2_fc_begin_commit(journal_t *journal, tid_t tid)`
`729`	`729`	`{`
	`730`	`+ if (unlikely(is_journal_aborted(journal)))`
	`731`	`+ return -EIO;`
`730`	`732`	`/*`
`731`	`733`	`* Fast commits only allowed if at least one full commit has`
`732`	`734`	`* been processed.`