commit da4e0be04d8816bbb9420c1da05ce09f502c5b75
author Al Viro <viro@zeniv.linux.org.uk> Sun May 03 20:52:15 2015 -0400
committer Al Viro <viro@zeniv.linux.org.uk> Sun May 10 22:20:03 2015 -0400
tree 6643e485a994b2aadd9363f8a96bf49cac03b2db
parent fd4620bbdf618998fd1a7df19e3443a698357e2b

link_path_walk: nd->depth massage, part 3

remove decrement/increment surrounding nd_alloc_stack(), adjust the
test in it.

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

fs/namei.c

diff --git a/fs/namei.c b/fs/namei.c
index a403425..3df4731 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -539,7 +539,7 @@
 
 static inline int nd_alloc_stack(struct nameidata *nd)
 {
-	if (likely(nd->depth != EMBEDDED_LEVELS - 1))
+	if (likely(nd->depth != EMBEDDED_LEVELS))
 		return 0;
 	if (likely(nd->stack != nd->internal))
 		return 0;
@@ -1824,9 +1824,7 @@
 		if (err) {
 			const char *s;
 
-			nd->depth--;
 			err = nd_alloc_stack(nd);
-			nd->depth++;
 			if (unlikely(err)) {
 				path_to_nameidata(&nd->link, nd);
 				break;