Skip to content

Commit 9e36c28

Browse files
Dan Carpenterpundiramit
authored andcommitted
f2fs: remove unneeded condition
commit 07fe8d44409f88be8f4a4e8f22b47ee709a22657 upstream. We checked that "inode" is not an error pointer earlier so there is no need to check again here. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
1 parent c85ef30 commit 9e36c28

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

fs/f2fs/namei.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,9 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry,
321321
if (err)
322322
goto err_out;
323323
}
324-
if (!IS_ERR(inode) && f2fs_encrypted_inode(dir) &&
325-
(S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) &&
326-
!fscrypt_has_permitted_context(dir, inode)) {
324+
if (f2fs_encrypted_inode(dir) &&
325+
(S_ISDIR(inode->i_mode) || S_ISLNK(inode->i_mode)) &&
326+
!fscrypt_has_permitted_context(dir, inode)) {
327327
bool nokey = f2fs_encrypted_inode(inode) &&
328328
!fscrypt_has_encryption_key(inode);
329329
err = nokey ? -ENOKEY : -EPERM;

0 commit comments

Comments
 (0)