9p: unify paths in v9fs_vfs_lookup()

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

1 files changed, 15 insertions, 20 deletions

diff --git a/fs/9p/vfs_inode.c b/fs/9p/vfs_inode.c
index 9ee534159cc6..42e102e2e74a 100644
--- a/fs/9p/vfs_inode.c
+++ b/fs/9p/vfs_inode.c
@@ -823,28 +823,21 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
         if (IS_ERR(dfid))
                 return ERR_CAST(dfid);
 
-        name = dentry->d_name.name;
-        fid = p9_client_walk(dfid, 1, &name, 1);
-        if (IS_ERR(fid)) {
-                if (fid == ERR_PTR(-ENOENT)) {
-                        d_add(dentry, NULL);
-                        return NULL;
-                }
-                return ERR_CAST(fid);
-        }
         /*
          * Make sure we don't use a wrong inode due to parallel
          * unlink. For cached mode create calls request for new
          * inode. But with cache disabled, lookup should do this.
          */
-        if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)
+        name = dentry->d_name.name;
+        fid = p9_client_walk(dfid, 1, &name, 1);
+        if (fid == ERR_PTR(-ENOENT))
+                inode = NULL;
+        else if (IS_ERR(fid))
+                inode = ERR_CAST(fid);
+        else if (v9ses->cache == CACHE_LOOSE || v9ses->cache == CACHE_FSCACHE)
                 inode = v9fs_get_inode_from_fid(v9ses, fid, dir->i_sb);
         else
                 inode = v9fs_get_new_inode_from_fid(v9ses, fid, dir->i_sb);
-        if (IS_ERR(inode)) {
-                p9_client_clunk(fid);
-                return ERR_CAST(inode);
-        }
         /*
          * If we had a rename on the server and a parallel lookup
          * for the new name, then make sure we instantiate with
@@ -853,12 +846,14 @@ struct dentry *v9fs_vfs_lookup(struct inode *dir, struct dentry *dentry,
          * k/b.
          */
         res = d_splice_alias(inode, dentry);
-        if (!res)
-                v9fs_fid_add(dentry, fid);
-        else if (!IS_ERR(res))
-                v9fs_fid_add(res, fid);
-        else
-                p9_client_clunk(fid);
+        if (!IS_ERR(fid)) {
+                if (!res)
+                        v9fs_fid_add(dentry, fid);
+                else if (!IS_ERR(res))
+                        v9fs_fid_add(res, fid);
+                else
+                        p9_client_clunk(fid);
+        }
         return res;
 }