3.16.59-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "Kirill A. Shutemov" kirill.shutemov@linux.intel.com
commit d83a08db5ba6072caa658745881f4baa9bad6a08 upstream.
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 [bwh: Backported to 3.16: - Deleted code is slightly different - Adjust context] Signed-off-by: Ben Hutchings ben@decadent.org.uk --- fs/9p/vfs_file.c | 2 -- fs/btrfs/file.c | 1 - fs/ceph/addr.c | 1 - fs/cifs/file.c | 1 - fs/ext4/file.c | 1 - fs/f2fs/file.c | 1 - fs/fuse/file.c | 1 - fs/gfs2/file.c | 1 - fs/nfs/file.c | 1 - fs/nilfs2/file.c | 1 - fs/ocfs2/mmap.c | 1 - fs/ubifs/file.c | 1 - fs/xfs/xfs_file.c | 1 - include/linux/fs.h | 6 ------ include/linux/mm.h | 3 --- mm/filemap.c | 1 - mm/filemap_xip.c | 1 - mm/shmem.c | 1 - 18 files changed, 26 deletions(-)
--- a/fs/9p/vfs_file.c +++ b/fs/9p/vfs_file.c @@ -831,7 +831,6 @@ static const struct vm_operations_struct .fault = filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = v9fs_vm_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
static const struct vm_operations_struct v9fs_mmap_file_vm_ops = { @@ -839,7 +838,6 @@ static const struct vm_operations_struct .fault = filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = v9fs_vm_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
--- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2025,7 +2025,6 @@ static const struct vm_operations_struct .fault = filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = btrfs_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
static int btrfs_file_mmap(struct file *filp, struct vm_area_struct *vma) --- a/fs/ceph/addr.c +++ b/fs/ceph/addr.c @@ -1327,7 +1327,6 @@ out: static struct vm_operations_struct ceph_vmops = { .fault = ceph_filemap_fault, .page_mkwrite = ceph_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
int ceph_mmap(struct file *file, struct vm_area_struct *vma) --- a/fs/cifs/file.c +++ b/fs/cifs/file.c @@ -3111,7 +3111,6 @@ static struct vm_operations_struct cifs_ .fault = filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = cifs_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
int cifs_file_strict_mmap(struct file *file, struct vm_area_struct *vma) --- a/fs/ext4/file.c +++ b/fs/ext4/file.c @@ -195,7 +195,6 @@ static const struct vm_operations_struct .fault = filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = ext4_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
static int ext4_file_mmap(struct file *file, struct vm_area_struct *vma) --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -87,7 +87,6 @@ static const struct vm_operations_struct .fault = filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = f2fs_vm_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
static int get_parent_ino(struct inode *inode, nid_t *pino) --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -2138,7 +2138,6 @@ static const struct vm_operations_struct .fault = filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = fuse_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
static int fuse_file_mmap(struct file *file, struct vm_area_struct *vma) --- a/fs/gfs2/file.c +++ b/fs/gfs2/file.c @@ -496,7 +496,6 @@ static const struct vm_operations_struct .fault = filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = gfs2_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
/** --- a/fs/nfs/file.c +++ b/fs/nfs/file.c @@ -618,7 +618,6 @@ static const struct vm_operations_struct .fault = filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = nfs_vm_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
static int nfs_need_sync_write(struct file *filp, struct inode *inode) --- a/fs/nilfs2/file.c +++ b/fs/nilfs2/file.c @@ -136,7 +136,6 @@ static const struct vm_operations_struct .fault = filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = nilfs_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
static int nilfs_file_mmap(struct file *file, struct vm_area_struct *vma) --- a/fs/ocfs2/mmap.c +++ b/fs/ocfs2/mmap.c @@ -173,7 +173,6 @@ out: static const struct vm_operations_struct ocfs2_file_vm_ops = { .fault = ocfs2_fault, .page_mkwrite = ocfs2_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
int ocfs2_mmap(struct file *file, struct vm_area_struct *vma) --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -1556,7 +1556,6 @@ static const struct vm_operations_struct .fault = filemap_fault, .map_pages = filemap_map_pages, .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) --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c @@ -1481,5 +1481,4 @@ static const struct vm_operations_struct .fault = xfs_filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = xfs_filemap_page_mkwrite, - .remap_pages = generic_file_remap_pages, }; --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -2430,12 +2430,6 @@ extern int sb_min_blocksize(struct super
extern int generic_file_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); extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *); extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *); --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -268,9 +268,6 @@ struct vm_operations_struct { int (*migrate)(struct vm_area_struct *vma, const nodemask_t *from, const nodemask_t *to, unsigned long flags); #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; --- a/mm/filemap.c +++ b/mm/filemap.c @@ -2078,7 +2078,6 @@ const struct vm_operations_struct generi .fault = filemap_fault, .map_pages = filemap_map_pages, .page_mkwrite = filemap_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
/* This is used for a general mmap of a disk file */ --- a/mm/filemap_xip.c +++ b/mm/filemap_xip.c @@ -306,7 +306,6 @@ out: static const struct vm_operations_struct xip_file_vm_ops = { .fault = xip_file_fault, .page_mkwrite = filemap_page_mkwrite, - .remap_pages = generic_file_remap_pages, };
int xip_file_mmap(struct file * file, struct vm_area_struct * vma) --- a/mm/shmem.c +++ b/mm/shmem.c @@ -2793,7 +2793,6 @@ static const struct vm_operations_struct .set_policy = shmem_set_policy, .get_policy = shmem_get_policy, #endif - .remap_pages = generic_file_remap_pages, };
static struct dentry *shmem_mount(struct file_system_type *fs_type,