[PATCH 17/24] link_path_walk: split "return from recursive call" path

Al Viro
2015-04-20T18:14:45Z

From: Al Viro <viro@zeniv.linux.org.uk>

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
fs/namei.c | 40 +++++++++++++++++-----------------------
1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/fs/namei.c b/fs/namei.c
index 4b98f4b..975918f 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1883,23 +1883,6 @@ Walked:
last->name = name;
name = s;
goto start;
-
-back:
- name = last->name;
- if (unlikely(err)) {
- put_link(nd, &last->link, last->cookie);
- nd->link_count--;
- nd->depth--;
- last--;
- goto Err;
- } else {
- err = walk_component(nd, &next, LOOKUP_FOLLOW);
- put_link(nd, &last->link, last->cookie);
- nd->link_count--;
- nd->depth--;
- last--;
- goto Walked;
- }
}
}
if (!d_can_lookup(nd->path.dentry)) {
@@ -1909,13 +1892,24 @@ back:
}
terminate_walk(nd);
Err:
- if (likely(!nd->depth))
- return err;
- goto back;
+ while (unlikely(nd->depth)) {
+ put_link(nd, &last->link, last->cookie);
+ nd->link_count--;
+ nd->depth--;
+ last--;
+ }
+ return err;
OK:
- if (likely(!nd->depth))
- return 0;
- goto back;
+ if (unlikely(nd->depth)) {
+ name = last->name;
+ err = walk_component(nd, &next, LOOKUP_FOLLOW);
+ put_link(nd, &last->link, last->cookie);
+ nd->link_count--;
+ nd->depth--;
+ last--;
+ goto Walked;
+ }
+ return 0;
}

static int path_init(int dfd, const struct filename *name, unsigned int flags,
--
2.1.4