untangling do_lookup() - merge d_alloc_and_lookup() callers

Al Viro · Al Viro · commit a6ecdfcfba93 · 2012-03-31T16:03:16.000-04:00
Signed-off-by: Al Viro &lt;viro@zeniv.linux.org.uk&gt;
diff --git a/fs/namei.c b/fs/namei.c
@@ -1188,12 +1188,12 @@ static int do_lookup(struct nameidata *nd, struct qstr *name,
 				}
 				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))

Original file line number	Diff line number	Diff line change
`@@ -1188,12 +1188,12 @@ static int do_lookup(struct nameidata nd, struct qstr name,`
`1188`	`1188`	`}`
`1189`	`1189`	`if (!d_invalidate(dentry)) {`
`1190`	`1190`	`dput(dentry);`
`1191`		`- dentry = d_alloc_and_lookup(parent, name, nd);`
	`1191`	`+ dentry = NULL;`
`1192`	`1192`	`}`
`1193`	`1193`	`}`
`1194`		`- } else if (!dentry) {`
`1195`		`- dentry = d_alloc_and_lookup(parent, name, nd);`
`1196`	`1194`	`}`
	`1195`	`+ if (!dentry)`
	`1196`	`+ dentry = d_alloc_and_lookup(parent, name, nd);`
`1197`	`1197`	`l:`
`1198`	`1198`	`mutex_unlock(&dir->i_mutex);`
`1199`	`1199`	`if (IS_ERR(dentry))`