diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-10-17 15:00:34 +0100 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-10-17 15:00:34 +0100 |
| commit | 7946ada30bc45546cefc85809ba0fd07879eff52 (patch) | |
| tree | 03c382e8e4f9b81f151be953de3b7f61411c9303 /mm/madvise.c | |
| parent | 98b270362bb9ea6629732e7f5b65b8a6ce4743c7 (diff) | |
| parent | 3d80636a0d5f056ffc26472d05b6027a7a9f6e1c (diff) | |
| download | linux-7946ada30bc45546cefc85809ba0fd07879eff52.tar.gz linux-7946ada30bc45546cefc85809ba0fd07879eff52.tar.xz | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'mm/madvise.c')
| -rw-r--r-- | mm/madvise.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mm/madvise.c b/mm/madvise.c index 4454936f87d1..20e075d1c64c 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -83,6 +83,9 @@ static long madvise_willneed(struct vm_area_struct * vma, { struct file *file = vma->vm_file; + if (!file) + return -EBADF; + if (file->f_mapping->a_ops->get_xip_page) { /* no bad return value, but ignore advice */ return 0; @@ -141,11 +144,7 @@ static long 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; - - if (!filp) - goto out; + long error; switch (behavior) { case MADV_NORMAL: @@ -166,8 +165,6 @@ madvise_vma(struct vm_area_struct *vma, struct vm_area_struct **prev, error = -EINVAL; break; } - -out: return error; } |