improve-code-readability-in-ext4_iget

   1 ext4: improve code readability in ext4_iget()
   2
   3 From: Liu Song <liu.song11@zte.com.cn>
   4
   5 Merge the duplicated complex conditions to improve code readability.
   6
   7 Signed-off-by: Liu Song <liu.song11@zte.com.cn>
   8 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
   9 Reviewed-by: Jiang Biao <jiang.biao2@zte.com.cn>
  10 ---
  11  fs/ext4/inode.c | 17 +++++++----------
  12  1 file changed, 7 insertions(+), 10 deletions(-)
  13
  14 diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
  15 index 60432498acfb..8f6ad7667974 100644
  16 --- a/fs/ext4/inode.c
  17 +++ b/fs/ext4/inode.c
  18 @@ -4982,17 +4982,14 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino)
  19                 ret = -EFSCORRUPTED;
  20                 goto bad_inode;
  21         } else if (!ext4_has_inline_data(inode)) {
  22 -               if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) {
  23 -                       if ((S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
  24 -                           (S_ISLNK(inode->i_mode) &&
  25 -                            !ext4_inode_is_fast_symlink(inode))))
  26 -                               /* Validate extent which is part of inode */
  27 +               /* validate the block references in the inode */
  28 +               if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
  29 +                  (S_ISLNK(inode->i_mode) &&
  30 +                   !ext4_inode_is_fast_symlink(inode))) {
  31 +                       if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))
  32                                 ret = ext4_ext_check_inode(inode);
  33 -               } else if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||
  34 -                          (S_ISLNK(inode->i_mode) &&
  35 -                           !ext4_inode_is_fast_symlink(inode))) {
  36 -                       /* Validate block references which are part of inode */
  37 -                       ret = ext4_ind_check_inode(inode);
  38 +                       else
  39 +                               ret = ext4_ind_check_inode(inode);
  40                 }
  41         }
  42         if (ret)