ext4: use sbi instead of EXT4_SB(sb) in ext4_update_super()
No behavioral change. Signed-off-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20201216101844.22917-6-jack@suse.cz Signed-off-by: Theodore Ts'o <tytso@mit.edu>master
parent
2d01ddc866
commit
e92ad03fa5
|
@ -5478,8 +5478,8 @@ err_out:
|
||||||
static void ext4_update_super(struct super_block *sb)
|
static void ext4_update_super(struct super_block *sb)
|
||||||
{
|
{
|
||||||
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
struct ext4_sb_info *sbi = EXT4_SB(sb);
|
||||||
struct ext4_super_block *es = EXT4_SB(sb)->s_es;
|
struct ext4_super_block *es = sbi->s_es;
|
||||||
struct buffer_head *sbh = EXT4_SB(sb)->s_sbh;
|
struct buffer_head *sbh = sbi->s_sbh;
|
||||||
|
|
||||||
lock_buffer(sbh);
|
lock_buffer(sbh);
|
||||||
/*
|
/*
|
||||||
|
@ -5496,21 +5496,20 @@ static void ext4_update_super(struct super_block *sb)
|
||||||
ext4_update_tstamp(es, s_wtime);
|
ext4_update_tstamp(es, s_wtime);
|
||||||
if (sb->s_bdev->bd_part)
|
if (sb->s_bdev->bd_part)
|
||||||
es->s_kbytes_written =
|
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,
|
((part_stat_read(sb->s_bdev->bd_part,
|
||||||
sectors[STAT_WRITE]) -
|
sectors[STAT_WRITE]) -
|
||||||
EXT4_SB(sb)->s_sectors_written_start) >> 1));
|
sbi->s_sectors_written_start) >> 1));
|
||||||
else
|
else
|
||||||
es->s_kbytes_written =
|
es->s_kbytes_written = cpu_to_le64(sbi->s_kbytes_written);
|
||||||
cpu_to_le64(EXT4_SB(sb)->s_kbytes_written);
|
if (percpu_counter_initialized(&sbi->s_freeclusters_counter))
|
||||||
if (percpu_counter_initialized(&EXT4_SB(sb)->s_freeclusters_counter))
|
|
||||||
ext4_free_blocks_count_set(es,
|
ext4_free_blocks_count_set(es,
|
||||||
EXT4_C2B(EXT4_SB(sb), percpu_counter_sum_positive(
|
EXT4_C2B(sbi, percpu_counter_sum_positive(
|
||||||
&EXT4_SB(sb)->s_freeclusters_counter)));
|
&sbi->s_freeclusters_counter)));
|
||||||
if (percpu_counter_initialized(&EXT4_SB(sb)->s_freeinodes_counter))
|
if (percpu_counter_initialized(&sbi->s_freeinodes_counter))
|
||||||
es->s_free_inodes_count =
|
es->s_free_inodes_count =
|
||||||
cpu_to_le32(percpu_counter_sum_positive(
|
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 */
|
/* Copy error information to the on-disk superblock */
|
||||||
spin_lock(&sbi->s_error_lock);
|
spin_lock(&sbi->s_error_lock);
|
||||||
if (sbi->s_add_error_count > 0) {
|
if (sbi->s_add_error_count > 0) {
|
||||||
|
|
Loading…
Reference in New Issue