f2fs: remove unneeded condition

PATCH New Dan Carpenter 1 participant 1 message Dec 16, 2016

Subsystems (2)

Kernel janitors F2FS file system

lore

Share & tools

lore

Dan Carpenter

author

2016-12-16 08:18 UTC #0 lore raw

PATCH 1/1 f2fs: remove unneeded condition

We checked that "inode" is not an error pointer earlier so there is no need to check again here.

Signed-off-by Dan Carpenter <[email protected]>

fs/f2fs/namei.c +3 -3

index 56c19b0610a8..290a9d7060ef 100644
@@ -321,9 +321,9 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,
 		if (err)
 			goto err_out;
 	}
-	if (!IS_ERR(inode) && f2fs_encrypted_inode(dir) &&
-			(S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) &&
-			!fscrypt_has_permitted_context(dir, inode)) {
+	if (f2fs_encrypted_inode(dir) &&
+	    (S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) &&
+	    !fscrypt_has_permitted_context(dir, inode)) {
 		bool nokey = f2fs_encrypted_inode(inode) &&
 			!fscrypt_has_encryption_key(inode);
 		err = nokey ? -ENOKEY : -EPERM;