[PATCH 3/5] ext4: fix error flag covered by journal recovery

[Ye Bin <yebin@huaweicloud.com>]

From: Ye Bin <yebin10@huawei.com>

Super block in journal maybe not uptodate, when file system has
error, we need set error information when do recover super block.

Signed-off-by: Ye Bin <yebin10@huawei.com>
---
 fs/ext4/super.c    | 38 ++++++++++++++++----------------------
 fs/jbd2/recovery.c | 14 ++++++++++++++
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index ea0fea04907c..ab136d08d93d 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5887,7 +5887,7 @@ static int ext4_load_journal(struct super_block *sb,
 		ext4_msg(sb, KERN_ERR,
 			 "journal device read-only, try mounting with '-o ro'");
 		err = -EROFS;
-		goto err_out;
+		goto out;
 	}
 
 	/*
@@ -5904,7 +5904,7 @@ static int ext4_load_journal(struct super_block *sb,
 					"unavailable, cannot proceed "
 					"(try mounting with noload)");
 				err = -EROFS;
-				goto err_out;
+				goto out;
 			}
 			ext4_msg(sb, KERN_INFO, "write access will "
 			       "be enabled during recovery");
@@ -5917,29 +5917,21 @@ static int ext4_load_journal(struct super_block *sb,
 	if (!ext4_has_feature_journal_needs_recovery(sb))
 		err = jbd2_journal_wipe(journal, !really_read_only);
 	if (!err) {
-		char *save = kmalloc(EXT4_S_ERR_LEN, GFP_KERNEL);
-		if (save)
-			memcpy(save, ((char *) es) +
-			       EXT4_S_ERR_START, EXT4_S_ERR_LEN);
-		err = jbd2_journal_load(journal);
-		if (save)
-			memcpy(((char *) es) + EXT4_S_ERR_START,
-			       save, EXT4_S_ERR_LEN);
-		kfree(save);
+		if (journal->j_replay_prepare_callback)
+			err = journal->j_replay_prepare_callback(journal);
+		if (!err)
+			err = jbd2_journal_load(journal);
 	}
 
 	if (err) {
 		ext4_msg(sb, KERN_ERR, "error loading journal");
-		goto err_out;
+		goto out;
 	}
 
 	EXT4_SB(sb)->s_journal = journal;
 	err = ext4_clear_journal_err(sb, es);
-	if (err) {
-		EXT4_SB(sb)->s_journal = NULL;
-		jbd2_journal_destroy(journal);
-		return err;
-	}
+	if (err)
+		goto out;
 
 	if (!really_read_only && journal_devnum &&
 	    journal_devnum != le32_to_cpu(es->s_journal_dev)) {
@@ -5948,11 +5940,13 @@ static int ext4_load_journal(struct super_block *sb,
 		/* Make sure we flush the recovery flag to disk. */
 		ext4_commit_super(sb);
 	}
-
-	return 0;
-
-err_out:
-	jbd2_journal_destroy(journal);
+out:
+	if (unlikely(journal->j_replay_end_callback))
+		journal->j_replay_end_callback(journal);
+	if (err) {
+		EXT4_SB(sb)->s_journal = NULL;
+		jbd2_journal_destroy(journal);
+	}
 	return err;
 }
 
diff --git a/fs/jbd2/recovery.c b/fs/jbd2/recovery.c
index 8286a9ec122f..8175d0a8d5f7 100644
--- a/fs/jbd2/recovery.c
+++ b/fs/jbd2/recovery.c
@@ -687,6 +687,20 @@ static int do_one_pass(journal_t *journal,
 						*((__be32 *)nbh->b_data) =
 						cpu_to_be32(JBD2_MAGIC_NUMBER);
 					}
+					if (unlikely(journal->j_replay_callback)) {
+						err = journal->j_replay_callback(
+							journal, nbh);
+						if (err) {
+							printk(KERN_ERR
+							       "JBD2: replay "
+							       "call back "
+							       "failed.\n");
+							unlock_buffer(nbh);
+							brelse(obh);
+							brelse(nbh);
+							goto failed;
+						}
+					}
 
 					BUFFER_TRACE(nbh, "marking dirty");
 					set_buffer_uptodate(nbh);
-- 
2.31.1