Commit d4dee48b authored by Al Viro's avatar Al Viro

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

with new calling conventions it's trivial
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>

Conflicts:
	fs/namei.c
parent 0a959df5
...@@ -865,12 +865,15 @@ get_link(struct path *link, struct nameidata *nd, void **p) ...@@ -865,12 +865,15 @@ 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_link;
if (!res) {
res = inode->i_op->follow_link(dentry, p, nd); res = inode->i_op->follow_link(dentry, p, nd);
if (IS_ERR(res)) { 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); ...@@ -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 (!link) {
link = dentry->d_inode->i_op->follow_link(dentry, &cookie, NULL);
if (IS_ERR(link)) if (IS_ERR(link))
return PTR_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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment