LKML Archive on lore.kernel.org help / color / mirror / Atom feed
From: Ye Bin <yebin10@huawei.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 -next 4/6] ext4: avoid to re-read mmp check data get from page cache Date: Mon, 6 Sep 2021 22:47:52 +0800 [thread overview] Message-ID: <20210906144754.2601607-5-yebin10@huawei.com> (raw) In-Reply-To: <20210906144754.2601607-1-yebin10@huawei.com> As call read_mmp_block pass bh_check which value is NULL, then call sb_getblk to get buffer_head. But mmp_block's buffer_head is already exist which also is uptodate. Lead to compare the same data. Signed-off-by: Ye Bin <yebin10@huawei.com> --- fs/ext4/mmp.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/fs/ext4/mmp.c b/fs/ext4/mmp.c index 0fe7b9ac9db6..2a1473e4a9de 100644 --- a/fs/ext4/mmp.c +++ b/fs/ext4/mmp.c @@ -213,10 +213,7 @@ static int kmmpd(void *data) * we need to check if the MMP block is as we write it. */ if (jiffies - last_check_time > mmp_check_interval * HZ) { - struct buffer_head *bh_check = NULL; - struct mmp_struct *mmp_check; - - retval = read_mmp_block(sb, &bh_check, mmp_block); + retval = read_mmp_block(sb, &bh, mmp_block); if (retval) { ext4_error_err(sb, -retval, "error reading MMP data: %d", @@ -224,20 +221,18 @@ static int kmmpd(void *data) goto wait_to_exit; } - mmp_check = (struct mmp_struct *)(bh_check->b_data); - if (seq != mmp_check->mmp_seq || - memcmp(nodename, mmp_check->mmp_nodename, - sizeof(mmp->mmp_nodename))) { - dump_mmp_msg(sb, mmp_check, + mmp = (struct mmp_struct *)(bh->b_data); + if (seq != le32_to_cpu(mmp->mmp_seq) || + memcmp(nodename, mmp->mmp_nodename, + sizeof(nodename))) { + dump_mmp_msg(sb, mmp, "Error while updating MMP info. " "The filesystem seems to have been" " multiply mounted."); ext4_error_err(sb, EBUSY, "abort"); - put_bh(bh_check); retval = -EBUSY; goto wait_to_exit; } - put_bh(bh_check); last_check_time = jiffies; } -- 2.31.1
next prev parent reply other threads:[~2021-09-06 14:38 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-06 14:47 [PATCH -next 0/6] Fix some issues about mmp Ye Bin 2021-09-06 14:47 ` [PATCH -next 1/6] ext4: init seq with random value in kmmpd Ye Bin 2021-09-06 14:47 ` [PATCH -next 2/6] ext4: introduce last_check_time record previous check time Ye Bin 2021-09-09 2:20 ` Guoqing Jiang 2021-09-10 8:49 ` yebin 2021-09-06 14:47 ` [PATCH -next 3/6] ext4: compare to local seq and nodename when check conflict Ye Bin 2021-09-06 14:47 ` Ye Bin [this message] 2021-09-06 14:47 ` [PATCH -next 5/6] ext4: avoid to double free s_mmp_bh Ye Bin 2021-09-06 14:47 ` [PATCH -next 6/6] ext4: fix possible store wrong check interval value in disk when umount Ye Bin
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=20210906144754.2601607-5-yebin10@huawei.com \ --to=yebin10@huawei.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 \ /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: linkBe 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).