diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-11-17 07:07:57 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-12-09 04:41:36 +0100 |
| commit | 21fc61c73c3903c4c312d0802da01ec2b323d174 (patch) | |
| tree | a26c29e3fbb766f00b023724e9e5b8b9bba9b879 /fs/coda | |
| parent | namei: page_getlink() and page_follow_link_light() are the same thing (diff) | |
| download | linux-21fc61c73c3903c4c312d0802da01ec2b323d174.tar.xz linux-21fc61c73c3903c4c312d0802da01ec2b323d174.zip | |
don't put symlink bodies in pagecache into highmem
kmap() in page_follow_link_light() needed to go - allowing to hold
an arbitrary number of kmaps for long is a great way to deadlocking
the system.
new helper (inode_nohighmem(inode)) needs to be used for pagecache
symlinks inodes; done for all in-tree cases. page_follow_link_light()
instrumented to yell about anything missed.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/coda')
| -rw-r--r-- | fs/coda/cnode.c | 2 | ||||
| -rw-r--r-- | fs/coda/symlink.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fs/coda/cnode.c b/fs/coda/cnode.c index 7740b1c871c1..dd6a79ef4750 100644 --- a/fs/coda/cnode.c +++ b/fs/coda/cnode.c @@ -8,6 +8,7 @@ #include <linux/coda.h> #include <linux/coda_psdev.h> +#include <linux/pagemap.h> #include "coda_linux.h" static inline int coda_fideq(struct CodaFid *fid1, struct CodaFid *fid2) @@ -35,6 +36,7 @@ static void coda_fill_inode(struct inode *inode, struct coda_vattr *attr) inode->i_fop = &coda_dir_operations; } else if (S_ISLNK(inode->i_mode)) { inode->i_op = &coda_symlink_inode_operations; + inode_nohighmem(inode); inode->i_data.a_ops = &coda_symlink_aops; inode->i_mapping = &inode->i_data; } else diff --git a/fs/coda/symlink.c b/fs/coda/symlink.c index ab94ef63caef..03736e20d720 100644 --- a/fs/coda/symlink.c +++ b/fs/coda/symlink.c @@ -26,7 +26,7 @@ static int coda_symlink_filler(struct file *file, struct page *page) int error; struct coda_inode_info *cii; unsigned int len = PAGE_SIZE; - char *p = kmap(page); + char *p = page_address(page); cii = ITOC(inode); @@ -34,13 +34,11 @@ static int coda_symlink_filler(struct file *file, struct page *page) if (error) goto fail; SetPageUptodate(page); - kunmap(page); unlock_page(page); return 0; fail: SetPageError(page); - kunmap(page); unlock_page(page); return error; } |