linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ye Bin <yebin@huaweicloud.com>
To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, jack@suse.cz, Ye Bin <yebin10@huawei.com>
Subject: [PATCH v2 4/6] ext4: remove backup for super block when recovery journal
Date: Fri, 10 Feb 2023 11:20:42 +0800	[thread overview]
Message-ID: <20230210032044.146115-5-yebin@huaweicloud.com> (raw)
In-Reply-To: <20230210032044.146115-1-yebin@huaweicloud.com>

From: Ye Bin <yebin10@huawei.com>

As previous commit "jbd2: do extra handle when do journal recovery"
already do extra handle for super block. There's no need to do in
ext4_load_journal(), so remove it.

Signed-off-by: Ye Bin <yebin10@huawei.com>
---
 fs/ext4/super.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index ea0fea04907c..d86ee5af2db9 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -5916,17 +5916,8 @@ 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);
+	if (!err)
 		err = jbd2_journal_load(journal);
-		if (save)
-			memcpy(((char *) es) + EXT4_S_ERR_START,
-			       save, EXT4_S_ERR_LEN);
-		kfree(save);
-	}
 
 	if (err) {
 		ext4_msg(sb, KERN_ERR, "error loading journal");
-- 
2.31.1


  parent reply	other threads:[~2023-02-10  2:57 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-02-10  3:20 [PATCH v2 0/6] fix error flag covered by journal recovery Ye Bin
2023-02-10  3:20 ` [PATCH v2 1/6] jbd2: introduce callback for recovery journal Ye Bin
2023-02-10  3:20 ` [PATCH v2 2/6] ext4: introudce helper for jounral recover handle Ye Bin
2023-02-10  3:20 ` [PATCH v2 3/6] jbd2: do extra handle when do journal recovery Ye Bin
2023-02-10  3:20 ` Ye Bin [this message]
2023-02-10  3:20 ` [PATCH v2 5/6] ext4: fix super block checksum error Ye Bin
2023-02-10  3:20 ` [PATCH v2 6/6] ext4: make sure fs error flag setted before clear journal error Ye Bin
2023-02-10 11:56 ` [PATCH v2 0/6] fix error flag covered by journal recovery Jan Kara
2023-02-10 12:47   ` Zhang Yi
2023-02-15  1:14   ` yebin (H)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230210032044.146115-5-yebin@huaweicloud.com \
    --to=yebin@huaweicloud.com \
    --cc=adilger.kernel@dilger.ca \
    --cc=jack@suse.cz \
    --cc=linux-ext4@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=tytso@mit.edu \
    --cc=yebin10@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).