mm: move ->mremap() from file_operations to vm_operations_struct

vma->vm_ops->mremap() looks more natural and clean in move_vma(), and this
way ->mremap() can have more users.  Say, vdso.

While at it, s/aio_ring_remap/aio_ring_mremap/.

Note: this is the minimal change before ->mremap() finds another user in
file_operations; this method should have more arguments, and it can be
used to kill arch_remap().

Signed-off-by: Oleg Nesterov <[email protected]>
Acked-by: Pavel Emelyanov <[email protected]>
Acked-by: Kirill A. Shutemov <[email protected]>
Cc: David Rientjes <[email protected]>
Cc: Benjamin LaHaise <[email protected]>
Cc: Hugh Dickins <[email protected]>
Cc: Jeff Moyer <[email protected]>
Cc: Laurent Dufour <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Oleg Nesterov 2015-09-04 15:48:04 -07:00 • committed by Linus Torvalds
commit 5477e70a64
4 changed files with 21 additions and 12 deletions

View file

@ -277,8 +277,8 @@ static unsigned long move_vma(struct vm_area_struct *vma,
need_rmap_locks);
if (moved_len < old_len) {
err = -ENOMEM;
} else if (vma->vm_file && vma->vm_file->f_op->mremap) {
err = vma->vm_file->f_op->mremap(vma->vm_file, new_vma);
} else if (vma->vm_ops && vma->vm_ops->mremap) {
err = vma->vm_ops->mremap(new_vma);
}
if (unlikely(err)) {