xfs_vn_lookup: simplify a bit

have all post-xfs_lookup() branches converge on d_splice_alias()

Cc: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

1 files changed, 8 insertions, 8 deletions

diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c
index a3ed3c811dfa..df42e4cb4dc4 100644
--- a/fs/xfs/xfs_iops.c
+++ b/fs/xfs/xfs_iops.c
@@ -260,6 +260,7 @@ xfs_vn_lookup(
         struct dentry   *dentry,
         unsigned int flags)
 {
+        struct inode *inode;
         struct xfs_inode *cip;
         struct xfs_name name;
         int             error;
@@ -269,14 +270,13 @@ xfs_vn_lookup(
 
         xfs_dentry_to_name(&name, dentry);
         error = xfs_lookup(XFS_I(dir), &name, &cip, NULL);
-        if (unlikely(error)) {
-                if (unlikely(error != -ENOENT))
-                        return ERR_PTR(error);
-                d_add(dentry, NULL);
-                return NULL;
-        }
-
-        return d_splice_alias(VFS_I(cip), dentry);
+        if (likely(!error))
+                inode = VFS_I(cip);
+        else if (likely(error == -ENOENT))
+                inode = NULL;
+        else
+                inode = ERR_PTR(error);
+        return d_splice_alias(inode, dentry);
 }
 
 STATIC struct dentry *