From: Al Viro <viro@zeniv.linux.org.uk>
Date: Tue, 8 Mar 2016 03:40:43 +0000 (-0500)
Subject: nfs_lookup: don't bother with d_instantiate(dentry, NULL)
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=130f9ab75dc3afdb96d49334bd941f2e6faf39a1;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

nfs_lookup: don't bother with d_instantiate(dentry, NULL)

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

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 9cce67043f92..4bfa7d8bcade 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1360,19 +1360,15 @@ struct dentry *nfs_lookup(struct inode *dir, struct dentry * dentry, unsigned in
 	dfprintk(VFS, "NFS: lookup(%pd2)\n", dentry);
 	nfs_inc_stats(dir, NFSIOS_VFSLOOKUP);
 
-	res = ERR_PTR(-ENAMETOOLONG);
-	if (dentry->d_name.len > NFS_SERVER(dir)->namelen)
-		goto out;
+	if (unlikely(dentry->d_name.len > NFS_SERVER(dir)->namelen))
+		return ERR_PTR(-ENAMETOOLONG);
 
 	/*
 	 * If we're doing an exclusive create, optimize away the lookup
 	 * but don't hash the dentry.
 	 */
-	if (nfs_is_exclusive_create(dir, flags)) {
-		d_instantiate(dentry, NULL);
-		res = NULL;
-		goto out;
-	}
+	if (nfs_is_exclusive_create(dir, flags))
+		return NULL;
 
 	res = ERR_PTR(-ENOMEM);
 	fhandle = nfs_alloc_fhandle();