[PATCH -next v4 2/3] ext4: remove useless bh_check variable
From: Ye Bin <hidden>
Date: 2021-10-19 12:27:07
Also in:
lkml
Subsystem:
ext4 file system, filesystems (vfs and infrastructure), the rest · Maintainers:
"Theodore Ts'o", Alexander Viro, Christian Brauner, Linus Torvalds
Since we initialize 'bh_check' to NULL and pass it to read_mmp_block(), that function will just call sb_getblk() which will just return the buffer_head we have in 'bh'. So just remove the pointless 'bh_check' variable and use 'bh' directly. Signed-off-by: Ye Bin <redacted> Reviewed-by: Jan Kara <jack@suse.cz> --- 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 97d5a8136eb2..9788c617e593 100644
--- a/fs/ext4/mmp.c
+++ b/fs/ext4/mmp.c@@ -195,10 +195,7 @@ static int kmmpd(void *data) */ diff = jiffies - last_update_time; if (diff > 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",
@@ -206,20 +203,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); } /*
--
2.31.1