redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

namei: simplify failure exits in get_link() 

when cookie is NULL, put_link() is equivalent to path_put(), so
as soon as we'd set last->cookie to NULL, we can bump nd->depth and
let the normal logics in terminate_walk() to take care of cleanups.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
hifive-unleashed-5.1
Al Viro 2015-05-10 10:43:46 -04:00
parent 6e77137b36
commit 6920a4405e
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fs/namei.c
View File

@ -904,27 +904,23 @@ const char *get_link(struct nameidata *nd)
last->link = nd->link;
last->cookie = NULL;
nd->depth++;
cond_resched();
touch_atime(&last->link);
error = security_inode_follow_link(dentry);
res = ERR_PTR(error);
if (error)
goto out;
return ERR_PTR(error);
nd->last_type = LAST_BIND;
res = inode->i_link;
if (!res) {
res = inode->i_op->follow_link(dentry, &last->cookie);
if (IS_ERR(res)) {
out:
path_put(&last->link);
return res;
}
if (IS_ERR_OR_NULL(res))
last->cookie = NULL;
}
nd->depth++;
return res;
}