diff options
| author |   Al Viro <viro@zeniv.linux.org.uk> | 2015-04-30 20:08:02 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-10 22:19:51 -0400 |
| commit | d4dee48badbb7ccd740087321518abcc870eda65 (patch) | |
| tree | aca840f709fd054b3143bb1f425394b5113535ca /fs/namei.c | |
| parent | namei.c: separate the parts of follow_link() that find the link body (diff) | |
| download | linux-dev-d4dee48badbb7ccd740087321518abcc870eda65.tar.xz linux-dev-d4dee48badbb7ccd740087321518abcc870eda65.zip | |
namei: don't bother with ->follow_link() if ->i_link is set
with new calling conventions it's trivial
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Conflicts:
fs/namei.c
Diffstat (limited to '')
| -rw-r--r-- | fs/namei.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/fs/namei.c b/fs/namei.c index a1ba5561daef..2ffb4afb250a 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -865,11 +865,14 @@ get_link(struct path *link, struct nameidata *nd, void **p) nd->last_type = LAST_BIND; *p = NULL; - res = inode->i_op->follow_link(dentry, p, nd); - if (IS_ERR(res)) { + res = inode->i_link; + if (!res) { + res = inode->i_op->follow_link(dentry, p, nd); + if (IS_ERR(res)) { out: - path_put(&nd->path); - path_put(link); + path_put(&nd->path); + path_put(link); + } } return res; } @@ -4418,11 +4421,14 @@ EXPORT_SYMBOL(readlink_copy); int generic_readlink(struct dentry *dentry, char __user *buffer, int buflen) { 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; - if (IS_ERR(link)) - return PTR_ERR(link); + if (!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); if (cookie && dentry->d_inode->i_op->put_link) dentry->d_inode->i_op->put_link(dentry, cookie); |