summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-05-04 02:46:54 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2015-05-11 04:20:02 +0200
commitfd4620bbdf618998fd1a7df19e3443a698357e2b (patch)
treecd238ebc2916a0877344462c3c2c7b4ab7e22ef8
parentlink_path_walk: nd->depth massage, part 1 (diff)
downloadlinux-fd4620bbdf618998fd1a7df19e3443a698357e2b.tar.xz
linux-fd4620bbdf618998fd1a7df19e3443a698357e2b.zip
link_path_walk: nd->depth massage, part 2
collapse adjacent increment/decrement pairs. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namei.c8
1 files changed, 0 insertions, 8 deletions
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--;