From: Al Viro <viro@zeniv.linux.org.uk>
Date: Mon, 4 May 2015 00:46:54 +0000 (-0400)
Subject: link_path_walk: nd->depth massage, part 2
X-Git-Tag: MMI-PSA29.97-13-9~9766^2~108
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fd4620bbdf618998fd1a7df19e3443a698357e2b;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

link_path_walk: nd->depth massage, part 2

collapse adjacent increment/decrement pairs.

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

diff --git a/fs/namei.c b/fs/namei.c
index e408f4d0c85f..a4034255d827 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1832,8 +1832,6 @@ Walked:
 				break;
 			}
 
-			nd->depth++;
-			nd->depth--;
 			s = get_link(nd);
 			nd->depth++;
 
@@ -1847,8 +1845,6 @@ Walked:
 				/* jumped */
 				nd->depth--;
 				put_link(nd);
-				nd->depth++;
-				nd->depth--;
 			} else {
 				if (*s == '/') {
 					if (!nd->root.mnt)
@@ -1878,8 +1874,6 @@ Err:
 	while (unlikely(nd->depth > 1)) {
 		nd->depth--;
 		put_link(nd);
-		nd->depth++;
-		nd->depth--;
 	}
 	nd->depth--;
 	return err;
@@ -1889,8 +1883,6 @@ OK:
 		err = walk_component(nd, LOOKUP_FOLLOW);
 		nd->depth--;
 		put_link(nd);
-		nd->depth++;
-		nd->depth--;
 		goto Walked;
 	}
 	nd->depth--;