openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

namei: lift (open-coded) terminate_walk() into callers of get_link() 

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

9
fs/namei.c
View File

@ -892,7 +892,6 @@ const char *get_link(struct nameidata *nd)
mntget(nd->link.mnt); mntget(nd->link.mnt);
if (unlikely(current->total_link_count >= MAXSYMLINKS)) { if (unlikely(current->total_link_count >= MAXSYMLINKS)) {
path_put(&nd->path);
path_put(&nd->link); path_put(&nd->link);
return ERR_PTR(-ELOOP); return ERR_PTR(-ELOOP);
} }
@ -916,7 +915,6 @@ const char *get_link(struct nameidata *nd)
res = inode->i_op->follow_link(dentry, &last->cookie, nd); res = inode->i_op->follow_link(dentry, &last->cookie, nd);
if (IS_ERR(res)) { if (IS_ERR(res)) {
out: out:
path_put(&nd->path);
path_put(&last->link); path_put(&last->link);
return res; return res;
} }
@ -1827,7 +1825,7 @@ static int link_path_walk(const char *name, struct nameidata *nd)
if (unlikely(IS_ERR(s))) { if (unlikely(IS_ERR(s))) {
err = PTR_ERR(s); err = PTR_ERR(s);
goto Err; break;
} }
err = 0; err = 0;
if (unlikely(!s)) { if (unlikely(!s)) {
@ -1858,7 +1856,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
} }
} }
terminate_walk(nd); terminate_walk(nd);
Err:
while (unlikely(nd->depth)) while (unlikely(nd->depth))
put_link(nd); put_link(nd);
return err; return err;
@ -1994,8 +1991,10 @@ static int trailing_symlink(struct nameidata *nd)
return error; return error;
nd->flags |= LOOKUP_PARENT; nd->flags |= LOOKUP_PARENT;
s = get_link(nd); s = get_link(nd);
if (unlikely(IS_ERR(s))) if (unlikely(IS_ERR(s))) {
terminate_walk(nd);
return PTR_ERR(s); return PTR_ERR(s);
}
if (unlikely(!s)) if (unlikely(!s))
return 0; return 0;
if (*s == '/') { if (*s == '/') {