adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] madvise() does not always return -EBADF on non-file mapped area

Browse source 
The madvise() system call returns -EBADF for areas which does not map to
files, only for *behaviour* request MADV_WILLNEED.

According to man pages, madvise returns :

EBADF - the map exists, but the area maps something that isn't a file.

Fixes bug 2995.

Signed-off-by: Suzuki K P <suzuki@in.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
suzuki 2005-07-27 11:43:59 -07:00 committed by Linus Torvalds
parent 4bfdf37830
commit 165cd40235
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
mm/madvise.c
View file

@ -83,9 +83,6 @@ static long madvise_willneed(struct vm_area_struct * vma,
{ {
struct file *file = vma->vm_file; struct file *file = vma->vm_file;
if (!file)
return -EBADF;
if (file->f_mapping->a_ops->get_xip_page) { if (file->f_mapping->a_ops->get_xip_page) {
/* no bad return value, but ignore advice */ /* no bad return value, but ignore advice */
return 0; return 0;
@ -140,11 +137,16 @@ static long madvise_dontneed(struct vm_area_struct * vma,
return 0; return 0;
} }
static long madvise_vma(struct vm_area_struct *vma, struct vm_area_struct **prev, static long
unsigned long start, unsigned long end, int behavior) madvise_vma(struct vm_area_struct *vma, struct vm_area_struct **prev,
unsigned long start, unsigned long end, int behavior)
{ {
struct file *filp = vma->vm_file;
long error = -EBADF; long error = -EBADF;
if (!filp)
goto out;
switch (behavior) { switch (behavior) {
case MADV_NORMAL: case MADV_NORMAL:
case MADV_SEQUENTIAL: case MADV_SEQUENTIAL:
@ -165,6 +167,7 @@ static long madvise_vma(struct vm_area_struct *vma, struct vm_area_struct **prev
break; break;
} }
out:
return error; return error;
} }