1 files changed, 12 insertions, 11 deletions

diff --git a/fs/efs/namei.c b/fs/efs/namei.c
index f7f407075be1..e26704742d41 100644
--- a/fs/efs/namei.c
+++ b/fs/efs/namei.c
@@ -66,9 +66,10 @@ struct dentry *efs_lookup(struct inode *dir, struct dentry *dentry, struct namei
         lock_kernel();
         inodenum = efs_find_entry(dir, dentry->d_name.name, dentry->d_name.len);
         if (inodenum) {
-                if (!(inode = iget(dir->i_sb, inodenum))) {
+                inode = efs_iget(dir->i_sb, inodenum);
+                if (IS_ERR(inode)) {
                         unlock_kernel();
-                        return ERR_PTR(-EACCES);
+                        return ERR_CAST(inode);
                 }
         }
         unlock_kernel();
@@ -84,12 +85,11 @@ static struct inode *efs_nfs_get_inode(struct super_block *sb, u64 ino,
 
         if (ino == 0)
                 return ERR_PTR(-ESTALE);
-        inode = iget(sb, ino);
-        if (inode == NULL)
-                return ERR_PTR(-ENOMEM);
+        inode = efs_iget(sb, ino);
+        if (IS_ERR(inode))
+                return ERR_CAST(inode);
 
-        if (is_bad_inode(inode) ||
-            (generation && inode->i_generation != generation)) {
+        if (generation && inode->i_generation != generation) {
                 iput(inode);
                 return ERR_PTR(-ESTALE);
         }
@@ -116,7 +116,7 @@ struct dentry *efs_get_parent(struct dentry *child)
         struct dentry *parent;
         struct inode *inode;
         efs_ino_t ino;
-        int error;
+        long error;
 
         lock_kernel();
 
@@ -125,10 +125,11 @@ struct dentry *efs_get_parent(struct dentry *child)
         if (!ino)
                 goto fail;
 
-        error = -EACCES;
-        inode = iget(child->d_inode->i_sb, ino);
-        if (!inode)
+        inode = efs_iget(child->d_inode->i_sb, ino);
+        if (IS_ERR(inode)) {
+                error = PTR_ERR(inode);
                 goto fail;
+        }
 
         error = -ENOMEM;
         parent = d_alloc_anon(inode);