Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[sfrench/cifs-2.6.git] / fs / minix / namei.c

diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index f4aa7a9390406b9f27cbd2fc9aaa4ddbc48dcf8d..102241bc9c7965e646585d871f4e1436a0057ccb 100644 (file)
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -54,10 +54,9 @@ static struct dentry *minix_lookup(struct inode * dir, struct dentry *dentry, st
 
        ino = minix_inode_by_name(dentry);
        if (ino) {
-               inode = iget(dir->i_sb, ino);
- 
-               if (!inode)
-                       return ERR_PTR(-EACCES);
+               inode = minix_iget(dir->i_sb, ino);
+               if (IS_ERR(inode))
+                       return ERR_CAST(inode);
        }
        d_add(dentry, inode);
        return NULL;