From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 4 May 2015 00:52:15 +0000 (-0400)
Subject: link_path_walk: nd->depth massage, part 3
X-Git-Tag: v4.2-rc1~180^2~77
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=da4e0be04d8816bbb9420c1da05ce09f502c5b75;p=karo-tx-linux.git

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>
---

diff --git a/fs/namei.c b/fs/namei.c
index a4034255d827..3df4731a7467 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -539,7 +539,7 @@ static int __nd_alloc_stack(struct nameidata *nd)
 
 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 @@ Walked:
 		if (err) {
 			const char *s;
 
-			nd->depth--;
 			err = nd_alloc_stack(nd);
-			nd->depth++;
 			if (unlikely(err)) {
 				path_to_nameidata(&nd->link, nd);
 				break;