leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

link_path_walk: move the OK: inside the loop

Browse Source 
fewer labels that way; in particular, resuming after the end of
nested symlink is straight-line.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-04 08:58:35 -04:00
parent 1543972678
commit 8620c238ed
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fs/namei.c
View File

@ -1806,11 +1806,21 @@ static int link_path_walk(const char *name, struct nameidata *nd)
do {
name++;
} while (unlikely(*name == '/'));
if (!*name)
goto OK;
err = walk_component(nd, LOOKUP_FOLLOW);
Walked:
if (unlikely(!*name)) {
OK:
/* called from path_init(), done */
if (!nd->depth)
return 0;
name = nd->stack[nd->depth - 1].name;
/* called from trailing_symlink(), done */
if (!name)
return 0;
/* last component of nested symlink */
err = walk_component(nd, LOOKUP_FOLLOW);
put_link(nd);
} else {
err = walk_component(nd, LOOKUP_FOLLOW);
}
if (err < 0)
break;
@ -1859,16 +1869,6 @@ Walked:
}
terminate_walk(nd);
return err;
OK:
if (!nd->depth) /* called from path_init(), done */
return 0;
name = nd->stack[nd->depth - 1].name;
if (!name) /* called from trailing_symlink(), done */
return 0;
err = walk_component(nd, LOOKUP_FOLLOW);
put_link(nd);
goto Walked;
}
static int path_init(int dfd, const struct filename *name, unsigned int flags,