adfs_lookup: do not fail with ENOENT on negatives, use d_splice_alias()

Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 5 insertions, 5 deletions

diff --git a/fs/adfs/dir.c b/fs/adfs/dir.c
index 77a2d6ca3c60..e18eff854e1a 100644
--- a/fs/adfs/dir.c
+++ b/fs/adfs/dir.c
@@ -252,17 +252,17 @@ adfs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags)
 
         error = adfs_dir_lookup_byname(dir, &dentry->d_name, &obj);
         if (error == 0) {
-                error = -EACCES;
                 /*
                  * This only returns NULL if get_empty_inode
                  * fails.
                  */
                 inode = adfs_iget(dir->i_sb, &obj);
-                if (inode)
-                        error = 0;
+                if (!inode)
+                        inode = ERR_PTR(-EACCES);
+        } else if (error != -ENOENT) {
+                inode = ERR_PTR(error);
         }
-        d_add(dentry, inode);
-        return ERR_PTR(error);
+        return d_splice_alias(inode, dentry);
 }
 
 /*