VisionFive2 Linux kernel

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

More than 9999 Commits   32 Branches   54 Tags
author: Xiaoguang Wang <xiaoguang.wang@linux.alibaba.com> 2019-01-31 23:42:11 -0500 committer: Theodore Ts'o <tytso@mit.edu> 2019-01-31 23:42:11 -0500 commit: 53cf978457325d8fb2cdecd7981b31a8229e446e parent: 8fdd60f2ae3682caf2a7258626abc21eb4711892
Commit Summary:
jbd2: fix deadlock while checkpoint thread waits commit thread to finish
Diffstat:
1 file changed, 1 insertion, 1 deletion
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 8ef6b6daaa7a..88d8f22d2cba 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2067,7 +2067,7 @@ int jbd2_journal_wipe(journal_t *journal, int write)
 	err = jbd2_journal_skip_recovery(journal);
 	if (write) {
 		/* Lock to make assertions happy... */
-		mutex_lock(&journal->j_checkpoint_mutex);
+		mutex_lock_io(&journal->j_checkpoint_mutex);
 		jbd2_mark_journal_empty(journal, REQ_SYNC | REQ_FUA);
 		mutex_unlock(&journal->j_checkpoint_mutex);
 	}