hfs: use d_splice_alias()

code is simpler that way

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

2 files changed, 8 insertions, 15 deletions

diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
index 75b254280ff6..3bf2ae0e467c 100644
--- a/fs/hfs/dir.c
+++ b/fs/hfs/dir.c
@@ -31,21 +31,15 @@ static struct dentry *hfs_lookup(struct inode *dir, struct dentry *dentry,
         hfs_cat_build_key(dir->i_sb, fd.search_key, dir->i_ino, &dentry->d_name);
         res = hfs_brec_read(&fd, &rec, sizeof(rec));
         if (res) {
-                hfs_find_exit(&fd);
-                if (res == -ENOENT) {
-                        /* No such entry */
-                        inode = NULL;
-                        goto done;
-                }
-                return ERR_PTR(res);
+                if (res != -ENOENT)
+                        inode = ERR_PTR(res);
+        } else {
+                inode = hfs_iget(dir->i_sb, &fd.search_key->cat, &rec);
+                if (!inode)
+                        inode = ERR_PTR(-EACCES);
         }
-        inode = hfs_iget(dir->i_sb, &fd.search_key->cat, &rec);
         hfs_find_exit(&fd);
-        if (!inode)
-                return ERR_PTR(-EACCES);
-done:
-        d_add(dentry, inode);
-        return NULL;
+        return d_splice_alias(inode, dentry);
 }
 
 /*
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 2538b49cc349..0612fa367bd1 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -544,8 +544,7 @@ static struct dentry *hfs_file_lookup(struct inode *dir, struct dentry *dentry,
         hlist_add_fake(&inode->i_hash);
         mark_inode_dirty(inode);
 out:
-        d_add(dentry, inode);
-        return NULL;
+        return d_splice_alias(inode, dentry);
 }
 
 void hfs_evict_inode(struct inode *inode)