summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs/namei.c32
1 files changed, 13 insertions, 19 deletions
diff --git a/fs/namei.c b/fs/namei.c
index 0c3974cd3ecd..4bae5cbfaa85 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -4518,7 +4518,7 @@ int generic_readlink(struct dentry *dentry, char __user *buffer, int buflen)
EXPORT_SYMBOL(generic_readlink);
/* get the link contents into pagecache */
-static char *page_getlink(struct dentry * dentry, struct page **ppage)
+static const char *page_getlink(struct dentry * dentry, void **cookie)
{
char *kaddr;
struct page *page;
@@ -4526,31 +4526,15 @@ static char *page_getlink(struct dentry * dentry, struct page **ppage)
page = read_mapping_page(mapping, 0, NULL);
if (IS_ERR(page))
return (char*)page;
- *ppage = page;
+ *cookie = page;
kaddr = kmap(page);
nd_terminate_link(kaddr, dentry->d_inode->i_size, PAGE_SIZE - 1);
return kaddr;
}
-int page_readlink(struct dentry *dentry, char __user *buffer, int buflen)
-{
- struct page *page = NULL;
- int res = readlink_copy(buffer, buflen, page_getlink(dentry, &page));
- if (page) {
- kunmap(page);
- page_cache_release(page);
- }
- return res;
-}
-EXPORT_SYMBOL(page_readlink);
-
const char *page_follow_link_light(struct dentry *dentry, void **cookie)
{
- struct page *page = NULL;
- char *res = page_getlink(dentry, &page);
- if (!IS_ERR(res))
- *cookie = page;
- return res;
+ return page_getlink(dentry, cookie);
}
EXPORT_SYMBOL(page_follow_link_light);
@@ -4562,6 +4546,16 @@ void page_put_link(struct inode *unused, void *cookie)
}
EXPORT_SYMBOL(page_put_link);
+int page_readlink(struct dentry *dentry, char __user *buffer, int buflen)
+{
+ void *cookie = NULL;
+ int res = readlink_copy(buffer, buflen, page_getlink(dentry, &cookie));
+ if (cookie)
+ page_put_link(NULL, cookie);
+ return res;
+}
+EXPORT_SYMBOL(page_readlink);
+
/*
* The nofs argument instructs pagecache_write_begin to pass AOP_FLAG_NOFS
*/