diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2015-04-18 20:44:34 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-10 22:19:59 -0400 |
| commit | 9e18f10a30e0c49520fbda39751fcae760445b96 (patch) | |
| tree | 1675b98a9a952473cb98fd04759606e8a21b8449 /fs | |
| parent | link_path_walk: split "return from recursive call" path (diff) | |
| download | linux-dev-9e18f10a30e0c49520fbda39751fcae760445b96.tar.xz linux-dev-9e18f10a30e0c49520fbda39751fcae760445b96.zip | |
link_path_walk: cleanup - turn goto start; into continue;
Deal with skipping leading slashes before what used to be the
recursive call. That way we can get rid of that goto completely.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c index 5b0edd331338..c105107ddf8f 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1718,11 +1718,10 @@ static int link_path_walk(const char *name, struct nameidata *nd) } stack[MAX_NESTED_LINKS], *last = stack + nd->depth - 1; int err; -start: while (*name=='/') name++; if (!*name) - goto OK; + return 0; /* At this point we know we have a real path component. */ for(;;) { @@ -1821,11 +1820,15 @@ Walked: nd->path = nd->root; path_get(&nd->root); nd->flags |= LOOKUP_JUMPED; + while (unlikely(*++s == '/')) + ; } nd->inode = nd->path.dentry->d_inode; last->name = name; + if (!*s) + goto OK; name = s; - goto start; + continue; } } if (!d_can_lookup(nd->path.dentry)) { |