mm: drop vm_ops->remap_pages and generic_file_remap_pages() stub
Nobody uses it anymore. [akpm@linux-foundation.org: fix filemap_xip.c] Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Cc: Wu Fengguang <fengguang.wu@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
9b4bdd2ffa
commit
d83a08db5b
@ -831,7 +831,6 @@ static const struct vm_operations_struct v9fs_file_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.page_mkwrite = v9fs_vm_page_mkwrite,
|
.page_mkwrite = v9fs_vm_page_mkwrite,
|
||||||
.remap_pages = generic_file_remap_pages,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct vm_operations_struct v9fs_mmap_file_vm_ops = {
|
static const struct vm_operations_struct v9fs_mmap_file_vm_ops = {
|
||||||
@ -839,7 +838,6 @@ static const struct vm_operations_struct v9fs_mmap_file_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.page_mkwrite = v9fs_vm_page_mkwrite,
|
.page_mkwrite = v9fs_vm_page_mkwrite,
|
||||||
.remap_pages = generic_file_remap_pages,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -2081,7 +2081,6 @@ static const struct vm_operations_struct btrfs_file_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.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)
|
||||||
|
@ -1569,7 +1569,6 @@ out:
|
|||||||
static struct vm_operations_struct ceph_vmops = {
|
static struct vm_operations_struct ceph_vmops = {
|
||||||
.fault = ceph_filemap_fault,
|
.fault = ceph_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)
|
||||||
|
@ -3248,7 +3248,6 @@ static struct vm_operations_struct cifs_file_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.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)
|
||||||
|
@ -195,7 +195,6 @@ static const struct vm_operations_struct ext4_file_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.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)
|
||||||
|
@ -92,7 +92,6 @@ static const struct vm_operations_struct f2fs_file_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.page_mkwrite = f2fs_vm_page_mkwrite,
|
.page_mkwrite = f2fs_vm_page_mkwrite,
|
||||||
.remap_pages = generic_file_remap_pages,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static int get_parent_ino(struct inode *inode, nid_t *pino)
|
static int get_parent_ino(struct inode *inode, nid_t *pino)
|
||||||
|
@ -2062,7 +2062,6 @@ static const struct vm_operations_struct fuse_file_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.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)
|
||||||
|
@ -498,7 +498,6 @@ static const struct vm_operations_struct gfs2_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.page_mkwrite = gfs2_page_mkwrite,
|
.page_mkwrite = gfs2_page_mkwrite,
|
||||||
.remap_pages = generic_file_remap_pages,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -646,7 +646,6 @@ static const struct vm_operations_struct nfs_file_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.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)
|
||||||
|
@ -128,7 +128,6 @@ static const struct vm_operations_struct nilfs_file_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.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)
|
||||||
|
@ -173,7 +173,6 @@ 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)
|
||||||
|
@ -1536,7 +1536,6 @@ static const struct vm_operations_struct ubifs_file_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.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)
|
||||||
|
@ -1384,5 +1384,4 @@ static const struct vm_operations_struct xfs_file_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.page_mkwrite = xfs_vm_page_mkwrite,
|
.page_mkwrite = xfs_vm_page_mkwrite,
|
||||||
.remap_pages = generic_file_remap_pages,
|
|
||||||
};
|
};
|
||||||
|
@ -2481,12 +2481,6 @@ 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 *);
|
||||||
static inline int generic_file_remap_pages(struct vm_area_struct *vma,
|
|
||||||
unsigned long addr, unsigned long size, pgoff_t pgoff)
|
|
||||||
{
|
|
||||||
BUG();
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
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_read_iter(struct kiocb *, struct iov_iter *);
|
extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *);
|
||||||
extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *);
|
extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *);
|
||||||
|
@ -285,9 +285,6 @@ struct vm_operations_struct {
|
|||||||
struct mempolicy *(*get_policy)(struct vm_area_struct *vma,
|
struct mempolicy *(*get_policy)(struct vm_area_struct *vma,
|
||||||
unsigned long addr);
|
unsigned long addr);
|
||||||
#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;
|
||||||
|
@ -2087,7 +2087,6 @@ const struct vm_operations_struct generic_file_vm_ops = {
|
|||||||
.fault = filemap_fault,
|
.fault = filemap_fault,
|
||||||
.map_pages = filemap_map_pages,
|
.map_pages = filemap_map_pages,
|
||||||
.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 */
|
||||||
|
@ -301,7 +301,6 @@ 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)
|
||||||
|
@ -3201,7 +3201,6 @@ 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,
|
||||||
|
Loading…
Reference in New Issue
Block a user