diff options
| author | Carsten Otte <cotte@de.ibm.com> | 2005-06-23 22:05:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-24 00:06:42 -0700 |
| commit | fe77ba6f4f97690baa4c756611a07f3cc033f6ae (patch) | |
| tree | 01abe2ed3f1ed6f9340f7d9cbad461cbedb47e65 /mm | |
| parent | eb6fe0c388e43b02e261f0fdee60e42f6298d7f7 (diff) | |
| download | linux-fe77ba6f4f97690baa4c756611a07f3cc033f6ae.tar.gz linux-fe77ba6f4f97690baa4c756611a07f3cc033f6ae.tar.bz2 linux-fe77ba6f4f97690baa4c756611a07f3cc033f6ae.zip | |
[PATCH] xip: madvice/fadvice: execute in place
Make sys_madvice/fadvice return sane with xip.
Signed-off-by: Carsten Otte <cotte@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/fadvise.c | 4 | ||||
| -rw-r--r-- | mm/madvise.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/mm/fadvise.c b/mm/fadvise.c index 57264d74b8bf..5f19e87bc5af 100644 --- a/mm/fadvise.c +++ b/mm/fadvise.c @@ -43,6 +43,10 @@ asmlinkage long sys_fadvise64_64(int fd, loff_t offset, loff_t len, int advice) goto out; } + if (mapping->a_ops->get_xip_page) + /* no bad return value, but ignore advice */ + goto out; + /* Careful about overflows. Len == 0 means "as much as possible" */ endbyte = offset + len; if (!len || endbyte < len) diff --git a/mm/madvise.c b/mm/madvise.c index 54a5d3bc55d5..73180a22877e 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -86,6 +86,11 @@ static long madvise_willneed(struct vm_area_struct * vma, if (!file) return -EBADF; + if (file->f_mapping->a_ops->get_xip_page) { + /* no bad return value, but ignore advice */ + return 0; + } + *prev = vma; start = ((start - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff; if (end > vma->vm_end) |