Commit 9e18f10a authored by Al Viro's avatar Al Viro

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: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 07681481
...@@ -1718,11 +1718,10 @@ static int link_path_walk(const char *name, struct nameidata *nd) ...@@ -1718,11 +1718,10 @@ static int link_path_walk(const char *name, struct nameidata *nd)
} stack[MAX_NESTED_LINKS], *last = stack + nd->depth - 1; } stack[MAX_NESTED_LINKS], *last = stack + nd->depth - 1;
int err; int err;
start:
while (*name=='/') while (*name=='/')
name++; name++;
if (!*name) if (!*name)
goto OK; return 0;
/* At this point we know we have a real path component. */ /* At this point we know we have a real path component. */
for(;;) { for(;;) {
...@@ -1821,11 +1820,15 @@ static int link_path_walk(const char *name, struct nameidata *nd) ...@@ -1821,11 +1820,15 @@ static int link_path_walk(const char *name, struct nameidata *nd)
nd->path = nd->root; nd->path = nd->root;
path_get(&nd->root); path_get(&nd->root);
nd->flags |= LOOKUP_JUMPED; nd->flags |= LOOKUP_JUMPED;
while (unlikely(*++s == '/'))
;
} }
nd->inode = nd->path.dentry->d_inode; nd->inode = nd->path.dentry->d_inode;
last->name = name; last->name = name;
if (!*s)
goto OK;
name = s; name = s;
goto start; continue;
} }
} }
if (!d_can_lookup(nd->path.dentry)) { if (!d_can_lookup(nd->path.dentry)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment