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

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
...@@ -332,7 +332,6 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -332,7 +332,6 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma)
if (vma->vm_file) if (vma->vm_file)
fput(vma->vm_file); fput(vma->vm_file);
vma->vm_file = asma->file; vma->vm_file = asma->file;
vma->vm_flags |= VM_CAN_NONLINEAR;
out: out:
mutex_unlock(&ashmem_mutex); mutex_unlock(&ashmem_mutex);
......
...@@ -738,6 +738,7 @@ v9fs_cached_file_write(struct file *filp, const char __user * data, ...@@ -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 = { static const struct vm_operations_struct v9fs_file_vm_ops = {
.fault = filemap_fault, .fault = filemap_fault,
.page_mkwrite = v9fs_vm_page_mkwrite, .page_mkwrite = v9fs_vm_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
......
...@@ -1599,6 +1599,7 @@ out: ...@@ -1599,6 +1599,7 @@ out:
static const struct vm_operations_struct btrfs_file_vm_ops = { static const struct vm_operations_struct btrfs_file_vm_ops = {
.fault = filemap_fault, .fault = filemap_fault,
.page_mkwrite = btrfs_page_mkwrite, .page_mkwrite = btrfs_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
static int btrfs_file_mmap(struct file *filp, struct vm_area_struct *vma) 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) ...@@ -1610,7 +1611,6 @@ static int btrfs_file_mmap(struct file *filp, struct vm_area_struct *vma)
file_accessed(filp); file_accessed(filp);
vma->vm_ops = &btrfs_file_vm_ops; vma->vm_ops = &btrfs_file_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR;
return 0; return 0;
} }
......
...@@ -1224,6 +1224,7 @@ out: ...@@ -1224,6 +1224,7 @@ out:
static struct vm_operations_struct ceph_vmops = { static struct vm_operations_struct ceph_vmops = {
.fault = filemap_fault, .fault = filemap_fault,
.page_mkwrite = ceph_page_mkwrite, .page_mkwrite = ceph_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
int ceph_mmap(struct file *file, struct vm_area_struct *vma) 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) ...@@ -1234,6 +1235,5 @@ int ceph_mmap(struct file *file, struct vm_area_struct *vma)
return -ENOEXEC; return -ENOEXEC;
file_accessed(file); file_accessed(file);
vma->vm_ops = &ceph_vmops; vma->vm_ops = &ceph_vmops;
vma->vm_flags |= VM_CAN_NONLINEAR;
return 0; return 0;
} }
...@@ -3003,6 +3003,7 @@ cifs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) ...@@ -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 = { static struct vm_operations_struct cifs_file_vm_ops = {
.fault = filemap_fault, .fault = filemap_fault,
.page_mkwrite = cifs_page_mkwrite, .page_mkwrite = cifs_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
int cifs_file_strict_mmap(struct file *file, struct vm_area_struct *vma) int cifs_file_strict_mmap(struct file *file, struct vm_area_struct *vma)
......
...@@ -207,6 +207,7 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov, ...@@ -207,6 +207,7 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov,
static const struct vm_operations_struct ext4_file_vm_ops = { static const struct vm_operations_struct ext4_file_vm_ops = {
.fault = filemap_fault, .fault = filemap_fault,
.page_mkwrite = ext4_page_mkwrite, .page_mkwrite = ext4_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma) static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma)
...@@ -217,7 +218,6 @@ static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -217,7 +218,6 @@ static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma)
return -ENOEXEC; return -ENOEXEC;
file_accessed(file); file_accessed(file);
vma->vm_ops = &ext4_file_vm_ops; vma->vm_ops = &ext4_file_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR;
return 0; return 0;
} }
......
...@@ -1379,6 +1379,7 @@ static const struct vm_operations_struct fuse_file_vm_ops = { ...@@ -1379,6 +1379,7 @@ static const struct vm_operations_struct fuse_file_vm_ops = {
.close = fuse_vma_close, .close = fuse_vma_close,
.fault = filemap_fault, .fault = filemap_fault,
.page_mkwrite = fuse_page_mkwrite, .page_mkwrite = fuse_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma) static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma)
......
...@@ -492,6 +492,7 @@ out: ...@@ -492,6 +492,7 @@ out:
static const struct vm_operations_struct gfs2_vm_ops = { static const struct vm_operations_struct gfs2_vm_ops = {
.fault = filemap_fault, .fault = filemap_fault,
.page_mkwrite = gfs2_page_mkwrite, .page_mkwrite = gfs2_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
/** /**
...@@ -526,7 +527,6 @@ static int gfs2_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -526,7 +527,6 @@ static int gfs2_mmap(struct file *file, struct vm_area_struct *vma)
return error; return error;
} }
vma->vm_ops = &gfs2_vm_ops; vma->vm_ops = &gfs2_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR;
return 0; return 0;
} }
......
...@@ -578,6 +578,7 @@ out: ...@@ -578,6 +578,7 @@ out:
static const struct vm_operations_struct nfs_file_vm_ops = { static const struct vm_operations_struct nfs_file_vm_ops = {
.fault = filemap_fault, .fault = filemap_fault,
.page_mkwrite = nfs_vm_page_mkwrite, .page_mkwrite = nfs_vm_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
static int nfs_need_sync_write(struct file *filp, struct inode *inode) static int nfs_need_sync_write(struct file *filp, struct inode *inode)
......
...@@ -135,13 +135,13 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf) ...@@ -135,13 +135,13 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
static const struct vm_operations_struct nilfs_file_vm_ops = { static const struct vm_operations_struct nilfs_file_vm_ops = {
.fault = filemap_fault, .fault = filemap_fault,
.page_mkwrite = nilfs_page_mkwrite, .page_mkwrite = nilfs_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
static int nilfs_file_mmap(struct file *file, struct vm_area_struct *vma) static int nilfs_file_mmap(struct file *file, struct vm_area_struct *vma)
{ {
file_accessed(file); file_accessed(file);
vma->vm_ops = &nilfs_file_vm_ops; vma->vm_ops = &nilfs_file_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR;
return 0; return 0;
} }
......
...@@ -173,6 +173,7 @@ out: ...@@ -173,6 +173,7 @@ out:
static const struct vm_operations_struct ocfs2_file_vm_ops = { static const struct vm_operations_struct ocfs2_file_vm_ops = {
.fault = ocfs2_fault, .fault = ocfs2_fault,
.page_mkwrite = ocfs2_page_mkwrite, .page_mkwrite = ocfs2_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
int ocfs2_mmap(struct file *file, struct vm_area_struct *vma) int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)
...@@ -188,7 +189,6 @@ int ocfs2_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -188,7 +189,6 @@ int ocfs2_mmap(struct file *file, struct vm_area_struct *vma)
ocfs2_inode_unlock(file->f_dentry->d_inode, lock_level); ocfs2_inode_unlock(file->f_dentry->d_inode, lock_level);
out: out:
vma->vm_ops = &ocfs2_file_vm_ops; vma->vm_ops = &ocfs2_file_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR;
return 0; return 0;
} }
...@@ -1536,6 +1536,7 @@ out_unlock: ...@@ -1536,6 +1536,7 @@ out_unlock:
static const struct vm_operations_struct ubifs_file_vm_ops = { static const struct vm_operations_struct ubifs_file_vm_ops = {
.fault = filemap_fault, .fault = filemap_fault,
.page_mkwrite = ubifs_vm_page_mkwrite, .page_mkwrite = ubifs_vm_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
static int ubifs_file_mmap(struct file *file, struct vm_area_struct *vma) static int ubifs_file_mmap(struct file *file, struct vm_area_struct *vma)
......
...@@ -940,7 +940,6 @@ xfs_file_mmap( ...@@ -940,7 +940,6 @@ xfs_file_mmap(
struct vm_area_struct *vma) struct vm_area_struct *vma)
{ {
vma->vm_ops = &xfs_file_vm_ops; vma->vm_ops = &xfs_file_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR;
file_accessed(filp); file_accessed(filp);
return 0; return 0;
...@@ -1443,4 +1442,5 @@ const struct file_operations xfs_dir_file_operations = { ...@@ -1443,4 +1442,5 @@ const struct file_operations xfs_dir_file_operations = {
static const struct vm_operations_struct xfs_file_vm_ops = { static const struct vm_operations_struct xfs_file_vm_ops = {
.fault = filemap_fault, .fault = filemap_fault,
.page_mkwrite = xfs_vm_page_mkwrite, .page_mkwrite = xfs_vm_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
...@@ -2552,6 +2552,8 @@ extern int sb_min_blocksize(struct super_block *, int); ...@@ -2552,6 +2552,8 @@ extern int sb_min_blocksize(struct super_block *, int);
extern int generic_file_mmap(struct file *, struct vm_area_struct *); extern int generic_file_mmap(struct file *, struct vm_area_struct *);
extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *); extern int generic_file_readonly_mmap(struct file *, struct vm_area_struct *);
extern int generic_file_remap_pages(struct vm_area_struct *, unsigned long addr,
unsigned long size, pgoff_t pgoff);
extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size); extern int file_read_actor(read_descriptor_t * desc, struct page *page, unsigned long offset, unsigned long size);
int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk); int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isblk);
extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t); extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t);
......
...@@ -105,7 +105,6 @@ extern unsigned int kobjsize(const void *objp); ...@@ -105,7 +105,6 @@ extern unsigned int kobjsize(const void *objp);
#define VM_ARCH_1 0x01000000 /* Architecture-specific flag */ #define VM_ARCH_1 0x01000000 /* Architecture-specific flag */
#define VM_NODUMP 0x04000000 /* Do not include in the core dump */ #define VM_NODUMP 0x04000000 /* Do not include in the core dump */
#define VM_CAN_NONLINEAR 0x08000000 /* Has ->fault & does nonlinear pages */
#define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */ #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */
#define VM_HUGEPAGE 0x20000000 /* MADV_HUGEPAGE marked this vma */ #define VM_HUGEPAGE 0x20000000 /* MADV_HUGEPAGE marked this vma */
#define VM_NOHUGEPAGE 0x40000000 /* MADV_NOHUGEPAGE marked this vma */ #define VM_NOHUGEPAGE 0x40000000 /* MADV_NOHUGEPAGE marked this vma */
...@@ -171,8 +170,7 @@ extern pgprot_t protection_map[16]; ...@@ -171,8 +170,7 @@ extern pgprot_t protection_map[16];
* of VM_FAULT_xxx flags that give details about how the fault was handled. * of VM_FAULT_xxx flags that give details about how the fault was handled.
* *
* pgoff should be used in favour of virtual_address, if possible. If pgoff * pgoff should be used in favour of virtual_address, if possible. If pgoff
* is used, one may set VM_CAN_NONLINEAR in the vma->vm_flags to get nonlinear * is used, one may implement ->remap_pages to get nonlinear mapping support.
* mapping support.
*/ */
struct vm_fault { struct vm_fault {
unsigned int flags; /* FAULT_FLAG_xxx flags */ unsigned int flags; /* FAULT_FLAG_xxx flags */
...@@ -230,6 +228,9 @@ struct vm_operations_struct { ...@@ -230,6 +228,9 @@ struct vm_operations_struct {
int (*migrate)(struct vm_area_struct *vma, const nodemask_t *from, int (*migrate)(struct vm_area_struct *vma, const nodemask_t *from,
const nodemask_t *to, unsigned long flags); const nodemask_t *to, unsigned long flags);
#endif #endif
/* called by sys_remap_file_pages() to populate non-linear mapping */
int (*remap_pages)(struct vm_area_struct *vma, unsigned long addr,
unsigned long size, pgoff_t pgoff);
}; };
struct mmu_gather; struct mmu_gather;
......
...@@ -1737,6 +1737,7 @@ EXPORT_SYMBOL(filemap_page_mkwrite); ...@@ -1737,6 +1737,7 @@ EXPORT_SYMBOL(filemap_page_mkwrite);
const struct vm_operations_struct generic_file_vm_ops = { const struct vm_operations_struct generic_file_vm_ops = {
.fault = filemap_fault, .fault = filemap_fault,
.page_mkwrite = filemap_page_mkwrite, .page_mkwrite = filemap_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
/* This is used for a general mmap of a disk file */ /* This is used for a general mmap of a disk file */
...@@ -1749,7 +1750,6 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma) ...@@ -1749,7 +1750,6 @@ int generic_file_mmap(struct file * file, struct vm_area_struct * vma)
return -ENOEXEC; return -ENOEXEC;
file_accessed(file); file_accessed(file);
vma->vm_ops = &generic_file_vm_ops; vma->vm_ops = &generic_file_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR;
return 0; return 0;
} }
......
...@@ -305,6 +305,7 @@ out: ...@@ -305,6 +305,7 @@ out:
static const struct vm_operations_struct xip_file_vm_ops = { static const struct vm_operations_struct xip_file_vm_ops = {
.fault = xip_file_fault, .fault = xip_file_fault,
.page_mkwrite = filemap_page_mkwrite, .page_mkwrite = filemap_page_mkwrite,
.remap_pages = generic_file_remap_pages,
}; };
int xip_file_mmap(struct file * file, struct vm_area_struct * vma) int xip_file_mmap(struct file * file, struct vm_area_struct * vma)
...@@ -313,7 +314,7 @@ int xip_file_mmap(struct file * file, struct vm_area_struct * vma) ...@@ -313,7 +314,7 @@ int xip_file_mmap(struct file * file, struct vm_area_struct * vma)
file_accessed(file); file_accessed(file);
vma->vm_ops = &xip_file_vm_ops; vma->vm_ops = &xip_file_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR | VM_MIXEDMAP; vma->vm_flags |= VM_MIXEDMAP;
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(xip_file_mmap); EXPORT_SYMBOL_GPL(xip_file_mmap);
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
* *
* started by Ingo Molnar, Copyright (C) 2002, 2003 * started by Ingo Molnar, Copyright (C) 2002, 2003
*/ */
#include <linux/export.h>
#include <linux/backing-dev.h> #include <linux/backing-dev.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/swap.h> #include <linux/swap.h>
...@@ -80,9 +81,10 @@ out: ...@@ -80,9 +81,10 @@ out:
return err; return err;
} }
static int populate_range(struct mm_struct *mm, struct vm_area_struct *vma, int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
unsigned long addr, unsigned long size, pgoff_t pgoff) unsigned long size, pgoff_t pgoff)
{ {
struct mm_struct *mm = vma->vm_mm;
int err; int err;
do { do {
...@@ -95,9 +97,9 @@ static int populate_range(struct mm_struct *mm, struct vm_area_struct *vma, ...@@ -95,9 +97,9 @@ static int populate_range(struct mm_struct *mm, struct vm_area_struct *vma,
pgoff++; pgoff++;
} while (size); } while (size);
return 0; return 0;
} }
EXPORT_SYMBOL(generic_file_remap_pages);
/** /**
* sys_remap_file_pages - remap arbitrary pages of an existing VM_SHARED vma * sys_remap_file_pages - remap arbitrary pages of an existing VM_SHARED vma
...@@ -167,7 +169,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, ...@@ -167,7 +169,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
if (vma->vm_private_data && !(vma->vm_flags & VM_NONLINEAR)) if (vma->vm_private_data && !(vma->vm_flags & VM_NONLINEAR))
goto out; goto out;
if (!(vma->vm_flags & VM_CAN_NONLINEAR)) if (!vma->vm_ops->remap_pages)
goto out; goto out;
if (start < vma->vm_start || start + size > vma->vm_end) if (start < vma->vm_start || start + size > vma->vm_end)
...@@ -228,7 +230,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, ...@@ -228,7 +230,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
} }
mmu_notifier_invalidate_range_start(mm, start, start + size); mmu_notifier_invalidate_range_start(mm, start, start + size);
err = populate_range(mm, vma, start, size, pgoff); err = vma->vm_ops->remap_pages(vma, start, size, pgoff);
mmu_notifier_invalidate_range_end(mm, start, start + size); mmu_notifier_invalidate_range_end(mm, start, start + size);
if (!err && !(flags & MAP_NONBLOCK)) { if (!err && !(flags & MAP_NONBLOCK)) {
if (vma->vm_flags & VM_LOCKED) { if (vma->vm_flags & VM_LOCKED) {
......
...@@ -669,8 +669,7 @@ again: remove_next = 1 + (end > next->vm_end); ...@@ -669,8 +669,7 @@ again: remove_next = 1 + (end > next->vm_end);
static inline int is_mergeable_vma(struct vm_area_struct *vma, static inline int is_mergeable_vma(struct vm_area_struct *vma,
struct file *file, unsigned long vm_flags) struct file *file, unsigned long vm_flags)
{ {
/* VM_CAN_NONLINEAR may get set later by f_op->mmap() */ if (vma->vm_flags ^ vm_flags)
if ((vma->vm_flags ^ vm_flags) & ~VM_CAN_NONLINEAR)
return 0; return 0;
if (vma->vm_file != file) if (vma->vm_file != file)
return 0; return 0;
......
...@@ -1961,6 +1961,14 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf) ...@@ -1961,6 +1961,14 @@ int filemap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
} }
EXPORT_SYMBOL(filemap_fault); EXPORT_SYMBOL(filemap_fault);
int generic_file_remap_pages(struct vm_area_struct *vma, unsigned long addr,
unsigned long size, pgoff_t pgoff)
{
BUG();
return 0;
}
EXPORT_SYMBOL(generic_file_remap_pages);
static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm,
unsigned long addr, void *buf, int len, int write) unsigned long addr, void *buf, int len, int write)
{ {
......
...@@ -1339,7 +1339,6 @@ static int shmem_mmap(struct file *file, struct vm_area_struct *vma) ...@@ -1339,7 +1339,6 @@ static int shmem_mmap(struct file *file, struct vm_area_struct *vma)
{ {
file_accessed(file); file_accessed(file);
vma->vm_ops = &shmem_vm_ops; vma->vm_ops = &shmem_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR;
return 0; return 0;
} }
...@@ -2643,6 +2642,7 @@ static const struct vm_operations_struct shmem_vm_ops = { ...@@ -2643,6 +2642,7 @@ static const struct vm_operations_struct shmem_vm_ops = {
.set_policy = shmem_set_policy, .set_policy = shmem_set_policy,
.get_policy = shmem_get_policy, .get_policy = shmem_get_policy,
#endif #endif
.remap_pages = generic_file_remap_pages,
}; };
static struct dentry *shmem_mount(struct file_system_type *fs_type, static struct dentry *shmem_mount(struct file_system_type *fs_type,
...@@ -2836,7 +2836,6 @@ int shmem_zero_setup(struct vm_area_struct *vma) ...@@ -2836,7 +2836,6 @@ int shmem_zero_setup(struct vm_area_struct *vma)
fput(vma->vm_file); fput(vma->vm_file);
vma->vm_file = file; vma->vm_file = file;
vma->vm_ops = &shmem_vm_ops; vma->vm_ops = &shmem_vm_ops;
vma->vm_flags |= VM_CAN_NONLINEAR;
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment