diff options
| author | Liu Song <liu.song11@zte.com.cn> | 2018-08-02 06:11:16 +0200 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2018-08-02 06:11:16 +0200 |
| commit | bc716523462f98ea6bfef3e1a5926daadbf32e9e (patch) | |
| tree | a517b11b54edcae628c69c32899d68039f564664 /fs/ext4/inode.c | |
| parent | ext4: fix spectre gadget in ext4_mb_regular_allocator() (diff) | |
| download | linux-bc716523462f98ea6bfef3e1a5926daadbf32e9e.tar.xz linux-bc716523462f98ea6bfef3e1a5926daadbf32e9e.zip | |
ext4: improve code readability in ext4_iget()
Merge the duplicated complex conditions to improve code readability.
Signed-off-by: Liu Song <liu.song11@zte.com.cn>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Jiang Biao <jiang.biao2@zte.com.cn>
Diffstat (limited to 'fs/ext4/inode.c')
| -rw-r--r-- | fs/ext4/inode.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 60432498acfb..8f6ad7667974 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -4982,17 +4982,14 @@ struct inode *ext4_iget(struct super_block *sb, unsigned long ino) ret = -EFSCORRUPTED; goto bad_inode; } else if (!ext4_has_inline_data(inode)) { - if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) { - if ((S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || - (S_ISLNK(inode->i_mode) && - !ext4_inode_is_fast_symlink(inode)))) - /* Validate extent which is part of inode */ + /* validate the block references in the inode */ + if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || + (S_ISLNK(inode->i_mode) && + !ext4_inode_is_fast_symlink(inode))) { + if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) ret = ext4_ext_check_inode(inode); - } else if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) || - (S_ISLNK(inode->i_mode) && - !ext4_inode_is_fast_symlink(inode))) { - /* Validate block references which are part of inode */ - ret = ext4_ind_check_inode(inode); + else + ret = ext4_ind_check_inode(inode); } } if (ret) |