Commit bc716523 authored by Liu Song's avatar Liu Song Committed by Theodore Ts'o
Browse files

ext4: improve code readability in ext4_iget() 



Merge the duplicated complex conditions to improve code readability.

Signed-off-by: default avatarLiu Song <liu.song11@zte.com.cn>
Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Reviewed-by: default avatarJiang Biao <jiang.biao2@zte.com.cn>
parent 1a5d5e5d

fs/ext4/inode.c

+7 −10
Original line number Diff line number Diff line
@@ -4982,16 +4982,13 @@ 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 */

				ret = ext4_ext_check_inode(inode);

		} else if (S_ISREG(inode->i_mode) || S_ISDIR(inode->i_mode) ||

		/* 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))) {

			/* Validate block references which are part of inode */

			if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))

				ret = ext4_ext_check_inode(inode);

			else

				ret = ext4_ind_check_inode(inode);

		}

	}