VisionFive2 Linux kernel

StarFive Tech Linux Kernel for VisionFive (JH7110) boards (mirror)

More than 9999 Commits   32 Branches   54 Tags
author: Mingming Cao <cmm@u.ibm.com> 2008-02-05 08:52:45 -0500 committer: Theodore Ts'o <tytso@mit.edu> 2008-02-05 08:52:45 -0500 commit: b048d8462652159c5314d19b191220b0ec384edb parent: 531021f2ca681faf58f926771f85bb5c76f13eba
Commit Summary:
jbd2: Add error check to journal_wait_on_commit_record to avoid oops
Diffstat:
1 file changed, 2 insertions, 1 deletion
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 4f302d279279..48b3cb8aeb2e 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -872,7 +872,8 @@ wait_for_iobuf:
 		if (err)
 			__jbd2_journal_abort_hard(journal);
 	}
-	err = journal_wait_on_commit_record(cbh);
+	if (!err && !is_journal_aborted(journal))
+		err = journal_wait_on_commit_record(cbh);
 
 	if (err)
 		jbd2_journal_abort(journal, err);