From: Jan Kara <jack@suse.cz> To: Ted Tso <tytso@mit.edu> Cc: <linux-ext4@vger.kernel.org>, Jan Kara <jack@suse.cz> Subject: [PATCH 12/12] ext4: Use sbi instead of EXT4_SB(sb) in ext4_update_super() Date: Fri, 27 Nov 2020 12:34:05 +0100 [thread overview] Message-ID: <20201127113405.26867-13-jack@suse.cz> (raw) In-Reply-To: <20201127113405.26867-1-jack@suse.cz> No behavioral change. Signed-off-by: Jan Kara <jack@suse.cz> --- fs/ext4/super.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 51670258ef84..3030a02304ef 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -5467,8 +5467,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); /* @@ -5485,21 +5485,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) { -- 2.16.4
next prev parent reply other threads:[~2020-11-27 11:34 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-27 11:33 [PATCH 00/12] ext4: Various fixes of ext4 handling of fs errors Jan Kara 2020-11-27 11:33 ` [PATCH 01/12] ext4: Don't remount read-only with errors=continue on reboot Jan Kara 2020-11-29 21:33 ` Andreas Dilger 2020-12-16 4:59 ` Theodore Y. Ts'o 2020-11-27 11:33 ` [PATCH 02/12] ext4: Remove redundant sb checksum recomputation Jan Kara 2020-11-29 22:11 ` Andreas Dilger 2020-11-30 10:59 ` Jan Kara 2020-12-16 5:01 ` Theodore Y. Ts'o 2020-11-27 11:33 ` [PATCH 03/12] ext4: Standardize error message in ext4_protect_reserved_inode() Jan Kara 2020-11-29 21:39 ` Andreas Dilger 2020-12-16 5:04 ` Theodore Y. Ts'o 2020-11-27 11:33 ` [PATCH 04/12] ext4: Make ext4_abort() use __ext4_error() Jan Kara 2020-11-29 22:12 ` Andreas Dilger 2020-12-16 5:07 ` Theodore Y. Ts'o 2020-11-27 11:33 ` [PATCH 05/12] ext4: Move functions in super.c Jan Kara 2020-11-29 22:13 ` Andreas Dilger 2020-12-16 5:09 ` Theodore Y. Ts'o 2020-11-27 11:33 ` [PATCH 06/12] ext4: Simplify ext4 error translation Jan Kara 2020-11-29 21:57 ` Andreas Dilger 2020-12-16 5:11 ` Theodore Y. Ts'o 2020-11-27 11:34 ` [PATCH 07/12] ext4: Defer saving error info from atomic context Jan Kara 2020-12-16 5:31 ` Theodore Y. Ts'o 2020-12-16 5:40 ` Theodore Y. Ts'o 2020-12-16 9:56 ` Jan Kara 2020-11-27 11:34 ` [PATCH 08/12] ext4: Combine ext4_handle_error() and save_error_info() Jan Kara 2020-12-14 19:23 ` harshad shirwadkar 2020-12-16 10:11 ` Jan Kara 2020-12-16 10:24 ` Jan Kara 2020-11-27 11:34 ` [PATCH 09/12] ext4: Drop sync argument of ext4_commit_super() Jan Kara 2020-12-14 19:25 ` harshad shirwadkar 2020-11-27 11:34 ` [PATCH 10/12] ext4: Protect superblock modifications with a buffer lock Jan Kara 2020-11-27 11:34 ` [PATCH 11/12] ext4: Save error info to sb through journal if available Jan Kara 2020-11-27 11:34 ` Jan Kara [this message] 2020-12-14 19:07 ` [PATCH 00/12] ext4: Various fixes of ext4 handling of fs errors harshad shirwadkar
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=20201127113405.26867-13-jack@suse.cz \ --to=jack@suse.cz \ --cc=linux-ext4@vger.kernel.org \ --cc=tytso@mit.edu \ --subject='Re: [PATCH 12/12] ext4: Use sbi instead of EXT4_SB(sb) in ext4_update_super()' \ /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: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.