use-sbi-instead-of-EXT4_SB

   1 ext4: use 'sbi' instead of 'EXT4_SB(sb)'
   2
   3 From: Jun Piao <piaojun@huawei.com>
   4
   5 We could use 'sbi' instead of 'EXT4_SB(sb)' to make code more elegant.
   6
   7 Signed-off-by: Jun Piao <piaojun@huawei.com>
   8 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
   9 Reviewed-by: Jan Kara <jack@suse.cz>
  10 ---
  11  fs/ext4/balloc.c         |  4 ++--
  12  fs/ext4/block_validity.c |  6 +++---
  13  fs/ext4/ialloc.c         |  4 ++--
  14  fs/ext4/mballoc.c        | 14 +++++++-------
  15  fs/ext4/resize.c         |  2 +-
  16  fs/ext4/super.c          |  6 +++---
  17  6 files changed, 18 insertions(+), 18 deletions(-)
  18
  19 diff --git a/fs/ext4/balloc.c b/fs/ext4/balloc.c
  20 index a943e56..f9b3e0a 100644
  21 --- a/fs/ext4/balloc.c
  22 +++ b/fs/ext4/balloc.c
  23 @@ -355,10 +355,10 @@ static ext4_fsblk_t ext4_valid_block_bitmap(struct super_block *sb,
  24         blk = ext4_inode_table(sb, desc);
  25         offset = blk - group_first_block;
  26         next_zero_bit = ext4_find_next_zero_bit(bh->b_data,
  27 -                       EXT4_B2C(sbi, offset + EXT4_SB(sb)->s_itb_per_group),
  28 +                       EXT4_B2C(sbi, offset + sbi->s_itb_per_group),
  29                         EXT4_B2C(sbi, offset));
  30         if (next_zero_bit <
  31 -           EXT4_B2C(sbi, offset + EXT4_SB(sb)->s_itb_per_group))
  32 +           EXT4_B2C(sbi, offset + sbi->s_itb_per_group))
  33                 /* bad bitmap for inode tables */
  34                 return blk;
  35         return 0;
  36 diff --git a/fs/ext4/block_validity.c b/fs/ext4/block_validity.c
  37 index bee888e..913061c 100644
  38 --- a/fs/ext4/block_validity.c
  39 +++ b/fs/ext4/block_validity.c
  40 @@ -147,11 +147,11 @@ int ext4_setup_system_zone(struct super_block *sb)
  41         int ret;
  42
  43         if (!test_opt(sb, BLOCK_VALIDITY)) {
  44 -               if (EXT4_SB(sb)->system_blks.rb_node)
  45 +               if (sbi->system_blks.rb_node)
  46                         ext4_release_system_zone(sb);
  47                 return 0;
  48         }
  49 -       if (EXT4_SB(sb)->system_blks.rb_node)
  50 +       if (sbi->system_blks.rb_node)
  51                 return 0;
  52
  53         for (i=0; i < ngroups; i++) {
  54 @@ -173,7 +173,7 @@ int ext4_setup_system_zone(struct super_block *sb)
  55         }
  56
  57         if (test_opt(sb, DEBUG))
  58 -               debug_print_tree(EXT4_SB(sb));
  59 +               debug_print_tree(sbi);
  60         return 0;
  61  }
  62
  63 diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c
  64 index b4267d7..3fd31a3 100644
  65 --- a/fs/ext4/ialloc.c
  66 +++ b/fs/ext4/ialloc.c
  67 @@ -303,7 +303,7 @@ void ext4_free_inode(handle_t *handle, struct inode *inode)
  68         /* Do this BEFORE marking the inode not in use or returning an error */
  69         ext4_clear_inode(inode);
  70
  71 -       es = EXT4_SB(sb)->s_es;
  72 +       es = sbi->s_es;
  73         if (ino < EXT4_FIRST_INO(sb) || ino > le32_to_cpu(es->s_inodes_count)) {
  74                 ext4_error(sb, "reserved or nonexistent inode %lu", ino);
  75                 goto error_return;
  76 @@ -1155,7 +1155,7 @@ struct inode *__ext4_new_inode(handle_t *handle, struct inode *dir,
  77         ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */
  78         ext4_set_inode_state(inode, EXT4_STATE_NEW);
  79
  80 -       ei->i_extra_isize = EXT4_SB(sb)->s_want_extra_isize;
  81 +       ei->i_extra_isize = sbi->s_want_extra_isize;
  82         ei->i_inline_off = 0;
  83         if (ext4_has_feature_inline_data(sb))
  84                 ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA);
  85 diff --git a/fs/ext4/mballoc.c b/fs/ext4/mballoc.c
  86 index d9f8b90..02e16a8 100644
  87 --- a/fs/ext4/mballoc.c
  88 +++ b/fs/ext4/mballoc.c
  89 @@ -769,10 +769,10 @@ void ext4_mb_generate_buddy(struct super_block *sb,
  90         clear_bit(EXT4_GROUP_INFO_NEED_INIT_BIT, &(grp->bb_state));
  91
  92         period = get_cycles() - period;
  93 -       spin_lock(&EXT4_SB(sb)->s_bal_lock);
  94 -       EXT4_SB(sb)->s_mb_buddies_generated++;
  95 -       EXT4_SB(sb)->s_mb_generation_time += period;
  96 -       spin_unlock(&EXT4_SB(sb)->s_bal_lock);
  97 +       spin_lock(&sbi->s_bal_lock);
  98 +       sbi->s_mb_buddies_generated++;
  99 +       sbi->s_mb_generation_time += period;
 100 +       spin_unlock(&sbi->s_bal_lock);
 101  }
 102
 103  static void mb_regenerate_buddy(struct ext4_buddy *e4b)
 104 @@ -1459,7 +1459,7 @@ static void mb_free_blocks(struct inode *inode, struct ext4_buddy *e4b,
 105                 ext4_fsblk_t blocknr;
 106
 107                 blocknr = ext4_group_first_block_no(sb, e4b->bd_group);
 108 -               blocknr += EXT4_C2B(EXT4_SB(sb), block);
 109 +               blocknr += EXT4_C2B(sbi, block);
 110                 ext4_grp_locked_error(sb, e4b->bd_group,
 111                                       inode ? inode->i_ino : 0,
 112                                       blocknr,
 113 @@ -4850,9 +4850,9 @@ void ext4_free_blocks(handle_t *handle, struct inode *inode,
 114         if (in_range(ext4_block_bitmap(sb, gdp), block, count) ||
 115             in_range(ext4_inode_bitmap(sb, gdp), block, count) ||
 116             in_range(block, ext4_inode_table(sb, gdp),
 117 -                    EXT4_SB(sb)->s_itb_per_group) ||
 118 +                    sbi->s_itb_per_group) ||
 119             in_range(block + count - 1, ext4_inode_table(sb, gdp),
 120 -                    EXT4_SB(sb)->s_itb_per_group)) {
 121 +                    sbi->s_itb_per_group)) {
 122
 123                 ext4_error(sb, "Freeing blocks in system zone - "
 124                            "Block = %llu, count = %lu", block, count);
 125 diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c
 126 index 50443bd..b6bec27 100644
 127 --- a/fs/ext4/resize.c
 128 +++ b/fs/ext4/resize.c
 129 @@ -1477,7 +1477,7 @@ static int ext4_flex_group_add(struct super_block *sb,
 130                 goto exit_journal;
 131
 132         group = flex_gd->groups[0].group;
 133 -       BUG_ON(group != EXT4_SB(sb)->s_groups_count);
 134 +       BUG_ON(group != sbi->s_groups_count);
 135         err = ext4_add_new_descs(handle, sb, group,
 136                                 resize_inode, flex_gd->count);
 137         if (err)
 138 diff --git a/fs/ext4/super.c b/fs/ext4/super.c
 139 index 0556cd0..165f564 100644
 140 --- a/fs/ext4/super.c
 141 +++ b/fs/ext4/super.c
 142 @@ -2676,7 +2676,7 @@ static ext4_fsblk_t descriptor_loc(struct super_block *sb,
 143          * compensate.
 144          */
 145         if (sb->s_blocksize == 1024 && nr == 0 &&
 146 -           le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block) == 0)
 147 +           le32_to_cpu(sbi->s_es->s_first_data_block) == 0)
 148                 has_super++;
 149
 150         return (has_super + ext4_group_first_block_no(sb, bg));
 151 @@ -3121,7 +3121,7 @@ int ext4_register_li_request(struct super_block *sb,
 152  {
 153         struct ext4_sb_info *sbi = EXT4_SB(sb);
 154         struct ext4_li_request *elr = NULL;
 155 -       ext4_group_t ngroups = EXT4_SB(sb)->s_groups_count;
 156 +       ext4_group_t ngroups = sbi->s_groups_count;
 157         int ret = 0;
 158
 159         mutex_lock(&ext4_li_mtx);
 160 @@ -4836,7 +4836,7 @@ static int ext4_sync_fs(struct super_block *sb, int wait)
 161         bool needs_barrier = false;
 162         struct ext4_sb_info *sbi = EXT4_SB(sb);
 163
 164 -       if (unlikely(ext4_forced_shutdown(EXT4_SB(sb))))
 165 +       if (unlikely(ext4_forced_shutdown(sbi)))
 166                 return 0;
 167
 168         trace_ext4_sync_fs(sb, wait);
 169 --
 170