summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2015-04-19 02:40:04 +0200
committerAl Viro <viro@zeniv.linux.org.uk>2015-05-11 04:19:58 +0200
commit07681481b865b5dc100f71cc82facaeaa9e69e86 (patch)
tree18fa407a95e85d393c33e39444753577dcac0354
parentlink_path_walk: kill the recursion (diff)
downloadlinux-07681481b865b5dc100f71cc82facaeaa9e69e86.tar.xz
linux-07681481b865b5dc100f71cc82facaeaa9e69e86.zip
link_path_walk: split "return from recursive call" path
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/namei.c40
1 files changed, 17 insertions, 23 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 9844bb2f041f..5b0edd331338 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -1826,23 +1826,6 @@ Walked:
last->name = name;
name = s;
goto start;
-
-back:
- name = last->name;
- if (unlikely(err)) {
- put_link(nd, &last->link, last->cookie);
- current->link_count--;
- nd->depth--;
- last--;
- goto Err;
- } else {
- err = walk_component(nd, LOOKUP_FOLLOW);
- put_link(nd, &last->link, last->cookie);
- current->link_count--;
- nd->depth--;
- last--;
- goto Walked;
- }
}
}
if (!d_can_lookup(nd->path.dentry)) {
@@ -1852,13 +1835,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);
+ current->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, LOOKUP_FOLLOW);
+ put_link(nd, &last->link, last->cookie);
+ current->link_count--;
+ nd->depth--;
+ last--;
+ goto Walked;
+ }
+ return 0;
}
static int path_init(int dfd, const struct filename *name, unsigned int flags,