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

namei: don't bother with ->follow_link() if ->i_link is set

Browse Source 
with new calling conventions it's trivial

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

Conflicts:
	fs/namei.c
This commit is contained in:
Al Viro 2015-04-30 20:08:02 -04:00
parent 0a959df54b
commit d4dee48bad
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fs/namei.c
View File

@ -865,11 +865,14 @@ get_link(struct path *link, struct nameidata *nd, void **p)
nd->last_type = LAST_BIND; nd->last_type = LAST_BIND;
*p = NULL; *p = NULL;
res = inode->i_op->follow_link(dentry, p, nd); res = inode->i_link;
if (IS_ERR(res)) { if (!res) {
res = inode->i_op->follow_link(dentry, p, nd);
if (IS_ERR(res)) {
out: out:
path_put(&nd->path); path_put(&nd->path);
path_put(link); path_put(link);
}
} }
return res; return res;
} }
@ -4418,11 +4421,14 @@ EXPORT_SYMBOL(readlink_copy);
int generic_readlink(struct dentry *dentry, char __user *buffer, int buflen) int generic_readlink(struct dentry *dentry, char __user *buffer, int buflen)
{ {
void *cookie; void *cookie;
const char *link = dentry->d_inode->i_op->follow_link(dentry, &cookie, NULL); const char *link = dentry->d_inode->i_link;
int res; int res;
if (IS_ERR(link)) if (!link) {
return PTR_ERR(link); link = dentry->d_inode->i_op->follow_link(dentry, &cookie, NULL);
if (IS_ERR(link))
return PTR_ERR(link);
}
res = readlink_copy(buffer, buflen, link); res = readlink_copy(buffer, buflen, link);
if (cookie && dentry->d_inode->i_op->put_link) if (cookie && dentry->d_inode->i_op->put_link)
dentry->d_inode->i_op->put_link(dentry, cookie); dentry->d_inode->i_op->put_link(dentry, cookie);