xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

link_path_walk: turn inner loop into explicit goto

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2015-04-18 20:03:03 -04:00
parent 12b0957800
commit d40bcc09ab
1 changed files with 31 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
fs/namei.c
View File

@@ -1775,6 +1775,10 @@ static int link_path_walk(const char *name, struct nameidata *nd)
return err; return err;
if (err) { if (err) {
struct path link;
void *cookie;
const char *s;
if (unlikely(current->link_count >= MAX_NESTED_LINKS)) { if (unlikely(current->link_count >= MAX_NESTED_LINKS)) {
path_put_conditional(&nd->link, nd); path_put_conditional(&nd->link, nd);
path_put(&nd->path); path_put(&nd->path);
@@ -1785,41 +1789,40 @@ static int link_path_walk(const char *name, struct nameidata *nd)
nd->depth++; nd->depth++;
current->link_count++; current->link_count++;
do { loop: /* will be gone very soon */
struct path link = nd->link; link = nd->link;
void *cookie; s = get_link(&link, nd, &cookie);
const char *s = get_link(&link, nd, &cookie);
if (unlikely(IS_ERR(s))) { if (unlikely(IS_ERR(s))) {
err = PTR_ERR(s); err = PTR_ERR(s);
current->link_count--; current->link_count--;
nd->depth--; nd->depth--;
return err; return err;
}
err = 0;
if (unlikely(!s)) {
/* jumped */
put_link(nd, &link, cookie);
} else {
if (*s == '/') {
if (!nd->root.mnt)
set_root(nd);
path_put(&nd->path);
nd->path = nd->root;
path_get(&nd->root);
nd->flags |= LOOKUP_JUMPED;
} }
err = 0; nd->inode = nd->path.dentry->d_inode;
if (unlikely(!s)) { err = link_path_walk(s, nd);
/* jumped */ if (unlikely(err)) {
put_link(nd, &link, cookie); put_link(nd, &link, cookie);
break;
} else { } else {
if (*s == '/') {
if (!nd->root.mnt)
set_root(nd);
path_put(&nd->path);
nd->path = nd->root;
path_get(&nd->root);
nd->flags |= LOOKUP_JUMPED;
}
nd->inode = nd->path.dentry->d_inode;
err = link_path_walk(s, nd);
if (unlikely(err)) {
put_link(nd, &link, cookie);
break;
}
err = walk_component(nd, LOOKUP_FOLLOW); err = walk_component(nd, LOOKUP_FOLLOW);
put_link(nd, &link, cookie); put_link(nd, &link, cookie);
if (err > 0)
goto loop;
} }
} while (err > 0); }
current->link_count--; current->link_count--;
nd->depth--; nd->depth--;