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.
Signed-off-by: Chunguang Xu <[email protected]>
---
fs/ext4/block_validity.c | 14 +++++++-------
fs/ext4/ext4.h | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c
index 16e9b2f..69240b4 100644
--- a/fs/ext4/block_validity.c
+++ b/fs/ext4/block_validity.c
@@ -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();
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 8ca9adf..d60a462 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -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 */
--
1.8.3.1
On 8/7/20 11:50 AM, brookxu wrote:
> 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.
>
> Signed-off-by: Chunguang Xu <[email protected]>
Other than the points mentioned in the other email in [Patch 1/2],
(related to --thread and author signed-off-by)
this patch looks good to me. Please feel free to add,
Reviewed-by: Ritesh Harjani <[email protected]>
> ---
> fs/ext4/block_validity.c | 14 +++++++-------
> fs/ext4/ext4.h | 2 +-
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c
> index 16e9b2f..69240b4 100644
> --- a/fs/ext4/block_validity.c
> +++ b/fs/ext4/block_validity.c
> @@ -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();
> diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
> index 8ca9adf..d60a462 100644
> --- a/fs/ext4/ext4.h
> +++ b/fs/ext4/ext4.h
> @@ -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 */
>