Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b173bc4 authored by Konstantin Khlebnikov's avatar Konstantin Khlebnikov Committed by Linus Torvalds
Browse files

mm: kill vma flag VM_CAN_NONLINEAR 



Move actual pte filling for non-linear file mappings into the new special
vma operation: ->remap_pages().

Filesystems must implement this method to get non-linear mapping support,
if it uses filemap_fault() then generic_file_remap_pages() can be used.

Now device drivers can implement this method and obtain nonlinear vma support.

Signed-off-by: default avatarKonstantin Khlebnikov <khlebnikov@openvz.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Carsten Otte <cotte@de.ibm.com>
Cc: Chris Metcalf <cmetcalf@tilera.com>	#arch/tile
Cc: Cyrill Gorcunov <gorcunov@openvz.org>
Cc: Eric Paris <eparis@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Morris <james.l.morris@oracle.com>
Cc: Jason Baron <jbaron@redhat.com>
Cc: Kentaro Takeda <takedakn@nttdata.co.jp>
Cc: Matt Helsley <matthltc@us.ibm.com>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: Venkatesh Pallipadi <venki@google.com>
Acked-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 4b6e1e37

drivers/staging/android/ashmem.c

+0 −1
Original line number Diff line number Diff line
@@ -332,7 +332,6 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) 
	if (vma->vm_file)

		fput(vma->vm_file);

	vma->vm_file = asma->file;

	vma->vm_flags |= VM_CAN_NONLINEAR;



out:

	mutex_unlock(&ashmem_mutex);

fs/9p/vfs_file.c

+1 −0
Original line number Diff line number Diff line
@@ -738,6 +738,7 @@ v9fs_cached_file_write(struct file *filp, const char __user * data, 
static const struct vm_operations_struct v9fs_file_vm_ops = {

	.fault = filemap_fault,

	.page_mkwrite = v9fs_vm_page_mkwrite,

	.remap_pages = generic_file_remap_pages,

};

fs/btrfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -1599,6 +1599,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync) 
static const struct vm_operations_struct btrfs_file_vm_ops = {

	.fault		= filemap_fault,

	.page_mkwrite	= btrfs_page_mkwrite,

	.remap_pages	= generic_file_remap_pages,

};



static int btrfs_file_mmap(struct file	*filp, struct vm_area_struct *vma)
@@ -1610,7 +1611,6 @@ static int btrfs_file_mmap(struct file *filp, struct vm_area_struct *vma) 


	file_accessed(filp);

	vma->vm_ops = &btrfs_file_vm_ops;

	vma->vm_flags |= VM_CAN_NONLINEAR;



	return 0;

}

fs/ceph/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -1224,6 +1224,7 @@ static int ceph_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
static struct vm_operations_struct ceph_vmops = {

	.fault		= filemap_fault,

	.page_mkwrite	= ceph_page_mkwrite,

	.remap_pages	= generic_file_remap_pages,

};



int ceph_mmap(struct file *file, struct vm_area_struct *vma)
@@ -1234,6 +1235,5 @@ int ceph_mmap(struct file *file, struct vm_area_struct *vma) 
		return -ENOEXEC;

	file_accessed(file);

	vma->vm_ops = &ceph_vmops;

	vma->vm_flags |= VM_CAN_NONLINEAR;

	return 0;

}

fs/cifs/file.c

+1 −0
Original line number Diff line number Diff line
@@ -3003,6 +3003,7 @@ cifs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) 
static struct vm_operations_struct cifs_file_vm_ops = {

	.fault = filemap_fault,

	.page_mkwrite = cifs_page_mkwrite,

	.remap_pages = generic_file_remap_pages,

};



int cifs_file_strict_mmap(struct file *file, struct vm_area_struct *vma)