Commit a353f8ac authored by Zhihao Cheng's avatar Zhihao Cheng Committed by Jialin Zhang
Browse files

ext4: ext4_put_super: Remove redundant checking for 'sbi->s_journal_bdev' 

maillist inclusion
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I6MMUV
CVE: NA

Reference: https://www.spinics.net/lists/linux-ext4/msg88237.html

--------------------------------

As discussed in [1], 'sbi->s_journal_bdev != sb->s_bdev' will always
become true if sbi->s_journal_bdev exists. Filesystem block device and
journal block device are both opened with 'FMODE_EXCL' mode, so these
two devices can't be same one. Then we can remove the redundant checking
'sbi->s_journal_bdev != sb->s_bdev' if 'sbi->s_journal_bdev' exists.

[1] https://lore.kernel.org/lkml/f86584f6-3877-ff18-47a1-2efaa12d18b2@huawei.com/



Signed-off-by: default avatarZhihao Cheng <chengzhihao1@huawei.com>
Reviewed-by: default avatarZhang Yi <yi.zhang@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parent 360b0525

fs/ext4/super.c

+1 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,7 @@ static void ext4_put_super(struct super_block *sb) 


	sync_blockdev(sb->s_bdev);

	invalidate_bdev(sb->s_bdev);

	if (sbi->s_journal_bdev && sbi->s_journal_bdev != sb->s_bdev) {

	if (sbi->s_journal_bdev) {

		sync_blockdev(sbi->s_journal_bdev);

		ext4_blkdev_remove(sbi);

	}