[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-ext4
Subject:    Re: [PATCH 2/2] ext4: rename system_blks to s_system_blks inside ext4_sb_info
From:       Andreas Dilger <adilger () dilger ! ca>
Date:       2020-07-29 20:03:23
Message-ID: 16D764F3-A1C9-4CFB-9151-19562FCA2064 () dilger ! ca
[Download RAW message or body]

On Jul 29, 2020, at 12:19 AM, brookxu <brookxu.cn@gmail.com> 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 <brookxu@tencent.com>

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

> ---
>  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
> 


Cheers, Andreas






["signature.asc" (signature.asc)]

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org

iQIzBAEBCAAdFiEEDb73u6ZejP5ZMprvcqXauRfMH+AFAl8h1gsACgkQcqXauRfM
H+CvFg//Vi2damzegj7lADd0q4Tp4HczZx/6GNtDoNsMK9Rqo6723K15cnhXkdZt
8fpkk7Ayb5Vn+A6VLnRmN/KzmsPmUL5hAVg17zMC1qsz9PV18ypTFb8qxKhL8gBC
sgtrfbyJcbAar0YZQbuePCSP7KboUHrDJwWyCUyvBOrCzhR3Fg2EXz6gyRjKeuK4
8VHi4yEXhM5BTYATOfjyVQq2vZe4h6IVyb1M5h4ST8isf10v3BC/PpyGQ16Z1AbJ
Fl6DlYQtZeRebuKsPx39d1R2kimReyIjsh9DeW7l3LHcU7HlKLmNebsQclwoZNGu
WjfHzmTnLPUeOn9BVfx0FqsM/CNIuuxXJrBZHjxwXnaqL9WJ+ognsMgFwtTwC6qG
a5MZeFuEGRqBdevLIlsTxYGDKbB2ayYgMysP47meNAaI7NT3hQMGLeCPvtiSrEMG
rAYtn+ZyNeAIWJS1CrJL8JePKAwSM4J4WEYwHvztRC2XPLw4/473m6OncftlALyN
yJ2au5MuTznYuRNeM0OPFSYS2B+tXJIJ787+mDg9fExtGW2WbZ7PV8/xlcdiqamW
v0Xo8UPfatLIozu77d/S8dOdIfSVS1/Gphbnr2lv69bNB4/nIQ6v6DVstCY+Ohjt
DwUN8O3mw5gIWmskBqcWuBzAzUxxKrk2PNaLFxfbCYztRRM48gU=
=g/25
-----END PGP SIGNATURE-----


[prev in list] [next in list] [prev in thread] [next in thread]