ext4: rename journal_dev to s_journal_dev inside ext4_sb_info
PATCH RESEND v2 1/2 ext4: rename journal_dev to s_journal_dev inside ext4_sb_info
From: Chunguang Xu <[email protected]>
Rename journal_dev to s_journal_dev inside ext4_sb_info, keep the naming rules consistent with other variables, which is convenient for code reading and writing.
--- fs/ext4/ext4.h | 2 +- fs/ext4/fsmap.c | 8 ++++---- fs/ext4/super.c | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-)
fs/ext4/ext4.h +1 -1
@@ -1463,7 +1463,7 @@ struct ext4_sb_info {unsigned long s_commit_interval;u32 s_max_batch_time;u32 s_min_batch_time; -struct block_device *journal_bdev; +struct block_device *s_journal_bdev;#ifdef CONFIG_QUOTA /* Names of quota files with journalled quota */ char __rcu *s_qf_names[EXT4_MAXQUOTAS ];
fs/ext4/fsmap.c +4 -4
@@ -571,8 +571,8 @@ static bool ext4_getfsmap_is_valid_device(struct super_block *sb,if (fm->fmr_device ==0 || fm->fmr_device ==UINT_MAX || fm->fmr_device ==new_encode_dev (sb->s_bdev->bd_dev))return true; -if (EXT4_SB (sb)->journal_bdev && - fm->fmr_device ==new_encode_dev (EXT4_SB (sb)->journal_bdev->bd_dev)) +if (EXT4_SB (sb)->s_journal_bdev && + fm->fmr_device ==new_encode_dev (EXT4_SB (sb)->s_journal_bdev->bd_dev))return true;return false; }
@@ -642,9 +642,9 @@ int ext4_getfsmap(struct super_block *sb, struct ext4_fsmap_head *head,memset (handlers,0 ,sizeof (handlers)); handlers[0 ].gfd_dev =new_encode_dev (sb->s_bdev->bd_dev); handlers[0 ].gfd_fn = ext4_getfsmap_datadev; -if (EXT4_SB (sb)->journal_bdev) { +if (EXT4_SB (sb)->s_journal_bdev) { handlers[1 ].gfd_dev =new_encode_dev ( -EXT4_SB (sb)->journal_bdev->bd_dev); +EXT4_SB (sb)->s_journal_bdev->bd_dev); handlers[1 ].gfd_fn = ext4_getfsmap_logdev; }
fs/ext4/super.c +7 -7
@@ -935,10 +935,10 @@ static void ext4_blkdev_put(struct block_device *bdev)static void ext4_blkdev_remove (struct ext4_sb_info *sbi) {struct block_device *bdev; - bdev = sbi->journal_bdev; + bdev = sbi->s_journal_bdev;if (bdev) {ext4_blkdev_put (bdev); - sbi->journal_bdev =NULL ; + sbi->s_journal_bdev =NULL ; } }
@@ -1069,14 +1069,14 @@ static void ext4_put_super(struct super_block *sb)sync_blockdev (sb->s_bdev);invalidate_bdev (sb->s_bdev); -if (sbi->journal_bdev && sbi->journal_bdev != sb->s_bdev) { +if (sbi->s_journal_bdev && sbi->s_journal_bdev != sb->s_bdev) {/* * Invalidate the journal device's buffers. We don't want them * floating about in memory - the physical journal device may * hotswapped, and it breaks the `ro-after' testing code. */ -sync_blockdev (sbi->journal_bdev); -invalidate_bdev (sbi->journal_bdev); +sync_blockdev (sbi->s_journal_bdev); +invalidate_bdev (sbi->s_journal_bdev);ext4_blkdev_remove (sbi); }
@@ -3712,7 +3712,7 @@ int ext4_calculate_overhead(struct super_block *sb)* Add the internal journal blocks whether the journal has been * loaded or not */ -if (sbi->s_journal && !sbi->journal_bdev) +if (sbi->s_journal && !sbi->s_journal_bdev) overhead +=EXT4_NUM_B2C (sbi, sbi->s_journal->j_maxlen);else if (ext4_has_feature_journal (sb) && !sbi->s_journal && j_inum) {/* j_inum for internal journal is non-zero */
@@ -5057,7 +5057,7 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb, be32_to_cpu(journal->j_superblock->s_nr_users)); goto out_journal; } -EXT4_SB (sb)->journal_bdev = bdev; +EXT4_SB (sb)->s_journal_bdev = bdev;ext4_init_journal_params (sb, journal);return journal;
Signature · 1 line
1.8.3.1
PATCH RESEND v2 2/2 ext4: rename system_blks to s_system_blks inside ext4_sb_info
From: Chunguang Xu <[email protected]>
Rename system_blks to s_system_blks inside ext4_sb_info, keep the naming rules consistent with other variables, which is convenient for code reading and writing.
--- fs/ext4/block_validity.c | 14 +++++++------- fs/ext4/ext4.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-)
fs/ext4/block_validity.c +7 -7
@@ -138,7 +138,7 @@ static void debug_print_tree(struct ext4_sb_info *sbi)printk (KERN_INFO "System zones: " );rcu_read_lock (); - system_blks =rcu_dereference (sbi->system_blks); + system_blks =rcu_dereference (sbi->s_system_blks); node =rb_first (&system_blks->root);while (node) { entry = rb_entry(node, struct ext4_system_zone, node);
@@ -263,11 +263,11 @@ int ext4_setup_system_zone(struct super_block *sb)int ret;if (!test_opt (sb,BLOCK_VALIDITY )) { -if (sbi->system_blks) +if (sbi->s_system_blks)ext4_release_system_zone (sb);return 0 ; } -if (sbi->system_blks) +if (sbi->s_system_blks)return 0 ; system_blks =kzalloc (sizeof (*system_blks),GFP_KERNEL );
@@ -308,7 +308,7 @@ int ext4_setup_system_zone(struct super_block *sb)* with ext4_data_block_valid() accessing the rbtree at the same * time. */ -rcu_assign_pointer (sbi->system_blks, system_blks); +rcu_assign_pointer (sbi->s_system_blks, system_blks);if (test_opt (sb,DEBUG ))debug_print_tree (sbi);
@@ -333,9 +333,9 @@ void ext4_release_system_zone(struct super_block *sb) {struct ext4_system_blocks *system_blks; - system_blks =rcu_dereference_protected (EXT4_SB (sb)->system_blks, + system_blks =rcu_dereference_protected (EXT4_SB (sb)->s_system_blks,lockdep_is_held (&sb->s_umount)); -rcu_assign_pointer (EXT4_SB (sb)->system_blks,NULL ); +rcu_assign_pointer (EXT4_SB (sb)->s_system_blks,NULL );if (system_blks)call_rcu (&system_blks->rcu, ext4_destroy_system_zone);
@@ -353,7 +353,7 @@ int ext4_data_block_valid(struct ext4_sb_info *sbi, ext4_fsblk_t start_blk,* mount option. */ rcu_read_lock (); - system_blks =rcu_dereference (sbi->system_blks); + system_blks =rcu_dereference (sbi->s_system_blks); ret =ext4_data_block_valid_rcu (sbi, system_blks, start_blk, count);rcu_read_unlock ();
fs/ext4/ext4.h +1 -1
@@ -1470,7 +1470,7 @@ struct ext4_sb_info {int s_jquota_fmt;/* Format of quota to use */ #endif unsigned int s_want_extra_isize;/* New inodes should reserve # bytes */ -struct ext4_system_blocks __rcu *system_blks; +struct ext4_system_blocks __rcu *s_system_blks;#ifdef EXTENTS_STATS /* ext4 extents stats */
Signature · 1 line
1.8.3.1
Re: [PATCH v2 RESEND 2/2] ext4: rename system_blks to s_system_blks inside ext4_sb_info
Quoted 9 lines · Chunguang Xu
From: Chunguang Xu <[email protected]>
Rename
system_blkstos_system_blksinsideext4_sb_info, keep the naming rules consistent with other variables, which is convenient for code reading and writing.Signed-off-by Chunguang Xu <[email protected]>Reviewed-by Andreas Dilger <[email protected]>Reviewed-by Ritesh Harjani <[email protected]>
Applied, thanks.
- Ted
Quoted 9 lines · Chunguang Xu
From: Chunguang Xu <[email protected]>
Rename
journal_devtos_journal_devinsideext4_sb_info, keep the naming rules consistent with other variables, which is convenient for code reading and writing.Signed-off-by Chunguang Xu <[email protected]>Reviewed-by Andreas Dilger <[email protected]>Reviewed-by Ritesh Harjani <[email protected]>
Applied, thanks.
- Ted