@@ -328,12 +328,12 @@ static long madvise_remove(struct vm_area_struct *vma,
* vma's reference to the file) can go away as soon as we drop
* mmap_sem.
*/
- get_file(vma);
+ vma_get_file(vma);
up_read(¤t->mm->mmap_sem);
error = do_fallocate(f,
FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE,
offset, end - start);
- fput(vma);
+ vma_fput(vma);
down_read(¤t->mm->mmap_sem);
return error;
}
@@ -85,13 +85,13 @@ SYSCALL_DEFINE3(msync, unsigned long, start, size_t, len, int, flags)
start = vma->vm_end;
if ((flags & MS_SYNC) && file &&
(vma->vm_flags & VM_SHARED)) {
- get_file(vma);
+ vma_get_file(vma);
up_read(&mm->mmap_sem);
if (vma->vm_flags & VM_NONLINEAR)
error = vfs_fsync(file, 1);
else
error = vfs_fsync_range(file, fstart, fend, 1);
- fput(vma);
+ vma_fput(vma);
if (error || start >= end)
goto out;
down_read(&mm->mmap_sem);
This reverts commit c35bf8ddb50b07d8b989ce958fddc01c6aec5dd3. BugLink: http://bugs.launchpad.net/bugs/1503655 Signed-off-by: Andy Whitcroft <apw@canonical.com> --- mm/madvise.c | 4 ++-- mm/msync.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)