From: Al Viro <viro@zeniv.linux.org.uk>
Date: Fri, 30 Mar 2012 18:39:15 +0000 (-0400)
Subject: untangling do_lookup() - merge d_alloc_and_lookup() callers
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a6ecdfcfba9392f469992dd6016ceafb3ea62123;p=openwrt%2Fstaging%2Fblogic.git

untangling do_lookup() - merge d_alloc_and_lookup() callers

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

diff --git a/fs/namei.c b/fs/namei.c
index a0f9a0294ff2..1d60fdf01b37 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1188,12 +1188,12 @@ retry:
 				}
 				if (!d_invalidate(dentry)) {
 					dput(dentry);
-					dentry = d_alloc_and_lookup(parent, name, nd);
+					dentry = NULL;
 				}
 			}
-		} else if (!dentry) {
-			dentry = d_alloc_and_lookup(parent, name, nd);
 		}
+		if (!dentry)
+			dentry = d_alloc_and_lookup(parent, name, nd);
 	l:
 		mutex_unlock(&dir->i_mutex);
 		if (IS_ERR(dentry))