1 files changed, 4 insertions, 6 deletions

diff --git a/fs/affs/namei.c b/fs/affs/namei.c
index b407e9eea3f..2218f1ee71c 100644
--- a/fs/affs/namei.c
+++ b/fs/affs/namei.c
@@ -208,9 +208,8 @@ affs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
         affs_lock_dir(dir);
         bh = affs_find_entry(dir, dentry);
         affs_unlock_dir(dir);
-        if (IS_ERR(bh)) {
+        if (IS_ERR(bh))
                 return ERR_CAST(bh);
-        }
         if (bh) {
                 u32 ino = bh->b_blocknr;
 
@@ -223,10 +222,9 @@ affs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd)
                         ino = be32_to_cpu(AFFS_TAIL(sb, bh)->original);
                 }
                 affs_brelse(bh);
-                inode = iget(sb, ino);
-                if (!inode) {
-                        return ERR_PTR(-EACCES);
-                }
+                inode = affs_iget(sb, ino);
+                if (IS_ERR(inode))
+                        return ERR_PTR(PTR_ERR(inode));
         }
         dentry->d_op = AFFS_SB(sb)->s_flags & SF_INTL ? &affs_intl_dentry_operations : &affs_dentry_operations;
         d_add(dentry, inode);