Commit 32a91432 authored by Jan Kara's avatar Jan Kara Committed by Zheng Zengkai
Browse files

ext4: use sbi instead of EXT4_SB(sb) in ext4_update_super() 



mainline inclusion
from mainline-v5.11-rc4
commit e92ad03f
category: bugfix
bugzilla: 50839
CVE: NA

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

No behavioral change.

Signed-off-by: default avatarJan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20201216101844.22917-6-jack@suse.cz


Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Signed-off-by: default avatarYe Bin <yebin10@huawei.com>
Reviewed-by: default avatarzhangyi (F) <yi.zhang@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 98498945

fs/ext4/super.c

+10 −11
Original line number Diff line number Diff line
@@ -5470,8 +5470,8 @@ static int ext4_load_journal(struct super_block *sb, 
static void ext4_update_super(struct super_block *sb)

{

	struct ext4_sb_info *sbi = EXT4_SB(sb);

	struct ext4_super_block *es = EXT4_SB(sb)->s_es;

	struct buffer_head *sbh = EXT4_SB(sb)->s_sbh;

	struct ext4_super_block *es = sbi->s_es;

	struct buffer_head *sbh = sbi->s_sbh;



	lock_buffer(sbh);

	/*
@@ -5488,21 +5488,20 @@ static void ext4_update_super(struct super_block *sb) 
		ext4_update_tstamp(es, s_wtime);

	if (sb->s_bdev->bd_part)

		es->s_kbytes_written =

			cpu_to_le64(EXT4_SB(sb)->s_kbytes_written +

			cpu_to_le64(sbi->s_kbytes_written +

			    ((part_stat_read(sb->s_bdev->bd_part,

					     sectors[STAT_WRITE]) -

			      EXT4_SB(sb)->s_sectors_written_start) >> 1));

			      sbi->s_sectors_written_start) >> 1));

	else

		es->s_kbytes_written =

			cpu_to_le64(EXT4_SB(sb)->s_kbytes_written);

	if (percpu_counter_initialized(&EXT4_SB(sb)->s_freeclusters_counter))

		es->s_kbytes_written = cpu_to_le64(sbi->s_kbytes_written);

	if (percpu_counter_initialized(&sbi->s_freeclusters_counter))

		ext4_free_blocks_count_set(es,

			EXT4_C2B(EXT4_SB(sb), percpu_counter_sum_positive(

				&EXT4_SB(sb)->s_freeclusters_counter)));

	if (percpu_counter_initialized(&EXT4_SB(sb)->s_freeinodes_counter))

			EXT4_C2B(sbi, percpu_counter_sum_positive(

				&sbi->s_freeclusters_counter)));

	if (percpu_counter_initialized(&sbi->s_freeinodes_counter))

		es->s_free_inodes_count =

			cpu_to_le32(percpu_counter_sum_positive(

				&EXT4_SB(sb)->s_freeinodes_counter));

				&sbi->s_freeinodes_counter));

	/* Copy error information to the on-disk superblock */

	spin_lock(&sbi->s_error_lock);

	if (sbi->s_add_error_count > 0) {