hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[PATCH] madvise: Avoid returning error code -EBADF for anonymous mappings 

Revert this recent correctness change: Douglas Crosher <dcrosher@scieneer.com>
reported that it broke an existing application, and that madvise() works
without error on anonymous mappings on Solaris.

This means that madvise() will remain non-standards-compliant: we should
return -EBADF for all requests against non-file-backed vma's, but Linux only
does this for MADV_WILLNEED requests.

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-10-11 08:29:06 -07:00 committed by Linus Torvalds
parent 22c1ea44f0
commit 1bef400329
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mm/madvise.c
View File

@ -83,6 +83,9 @@ 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;
@ -141,11 +144,7 @@ static long
madvise_vma(struct vm_area_struct *vma, struct vm_area_struct **prev, madvise_vma(struct vm_area_struct *vma, struct vm_area_struct **prev,
unsigned long start, unsigned long end, int behavior) unsigned long start, unsigned long end, int behavior)
{ {
struct file *filp = vma->vm_file; long error;
long error = -EBADF;
if (!filp)
goto out;
switch (behavior) { switch (behavior) {
case MADV_NORMAL: case MADV_NORMAL:
@ -166,8 +165,6 @@ madvise_vma(struct vm_area_struct *vma, struct vm_area_struct **prev,
error = -EINVAL; error = -EINVAL;
break; break;
} }
out:
return error; return error;
} }