splice: Use filemap_splice_read() instead of generic_file_splice_read()

Replace pointers to generic_file_splice_read() with calls to
filemap_splice_read().

Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Christian Brauner <brauner@kernel.org>
cc: Jens Axboe <axboe@kernel.dk>
cc: Al Viro <viro@zeniv.linux.org.uk>
cc: David Hildenbrand <david@redhat.com>
cc: John Hubbard <jhubbard@nvidia.com>
cc: linux-mm@kvack.org
cc: linux-block@vger.kernel.org
cc: linux-fsdevel@vger.kernel.org
Link: https://lore.kernel.org/r/20230522135018.2742245-29-dhowells@redhat.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/block/fops.c b/block/fops.c
index d2e6be4e3d1c7da029d0a38bd18cf9b069f901e2..6c9aa028af6e097188bca1fa8bb01989047ccfde 100644 (file)
--- a/block/fops.c
+++ b/block/fops.c
@@ -691,7 +691,7 @@ const struct file_operations def_blk_fops = {
 #ifdef CONFIG_COMPAT
        .compat_ioctl   = compat_blkdev_ioctl,
 #endif
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,
        .fallocate      = blkdev_fallocate,
 };

diff --git a/fs/adfs/file.c b/fs/adfs/file.c
index 754afb14a6ff74aa47c01cae529f86a564252d9a..ee80718aaeecc369b2249977962f103fb8b22135 100644 (file)
--- a/fs/adfs/file.c
+++ b/fs/adfs/file.c
@@ -28,7 +28,7 @@ const struct file_operations adfs_file_operations = {
        .mmap           = generic_file_mmap,
        .fsync          = generic_file_fsync,
        .write_iter     = generic_file_write_iter,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
 };
 
 const struct inode_operations adfs_file_inode_operations = {

diff --git a/fs/affs/file.c b/fs/affs/file.c
index 8daeed31e1af949a01beba514664f21725fdebda..e43f2f007ac1a5440b6f6b67471de12d0640d892 100644 (file)
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -1001,7 +1001,7 @@ const struct file_operations affs_file_operations = {
        .open           = affs_file_open,
        .release        = affs_file_release,
        .fsync          = affs_file_fsync,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
 };
 
 const struct inode_operations affs_file_inode_operations = {

diff --git a/fs/afs/file.c b/fs/afs/file.c
index d8a6b09dadf77256b2db5c49e30e296da75b7b1c..d37dd201752baa9d5c01b4c4181969f86a03c5f1 100644 (file)
--- a/fs/afs/file.c
+++ b/fs/afs/file.c
@@ -603,5 +603,5 @@ static ssize_t afs_file_splice_read(struct file *in, loff_t *ppos,
        if (ret < 0)
                return ret;
 
-       return generic_file_splice_read(in, ppos, pipe, len, flags);
+       return filemap_splice_read(in, ppos, pipe, len, flags);
 }

diff --git a/fs/bfs/file.c b/fs/bfs/file.c
index 57ae5ee6deec12ac8f75146177734b34a1fc59d5..adc2230079c625e23c65f97d9a79dd7dbb92c47e 100644 (file)
--- a/fs/bfs/file.c
+++ b/fs/bfs/file.c
@@ -27,7 +27,7 @@ const struct file_operations bfs_file_operations = {
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
        .mmap           = generic_file_mmap,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
 };
 
 static int bfs_move_block(unsigned long from, unsigned long to,

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index f649647392e0e47c62f030d5c59c74cf633e4fac..71426c6408fa196fcaa294837edea2224bf19c87 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -3825,7 +3825,7 @@ static ssize_t btrfs_file_read_iter(struct kiocb *iocb, struct iov_iter *to)
 const struct file_operations btrfs_file_operations = {
        .llseek         = btrfs_file_llseek,
        .read_iter      = btrfs_file_read_iter,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .write_iter     = btrfs_file_write_iter,
        .splice_write   = iter_file_splice_write,
        .mmap           = btrfs_file_mmap,

diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index 006ef68d7ff6affe93f4679820643a57fbd26caf..27c6597aa1be5a0fc0bce9be27f4244ce74369ac 100644 (file)
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -473,7 +473,7 @@ static unsigned int cramfs_physmem_mmap_capabilities(struct file *file)
 static const struct file_operations cramfs_physmem_fops = {
        .llseek                 = generic_file_llseek,
        .read_iter              = generic_file_read_iter,
-       .splice_read            = generic_file_splice_read,
+       .splice_read            = filemap_splice_read,
        .mmap                   = cramfs_physmem_mmap,
 #ifndef CONFIG_MMU
        .get_unmapped_area      = cramfs_physmem_get_unmapped_area,

diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 284395587be04cfd155d88f4a45945648894ba47..ce0a3c5ed0ca9b84efab7d8a9d59c839549991e7 100644 (file)
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -47,7 +47,7 @@ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb,
 /*
  * ecryptfs_splice_read_update_atime
  *
- * generic_file_splice_read updates the atime of upper layer inode.  But, it
+ * filemap_splice_read updates the atime of upper layer inode.  But, it
  * doesn't give us a chance to update the atime of the lower layer inode.  This
  * function is a wrapper to generic_file_read.  It updates the atime of the
  * lower level inode if generic_file_read returns without any errors. This is
@@ -61,7 +61,7 @@ static ssize_t ecryptfs_splice_read_update_atime(struct file *in, loff_t *ppos,
        ssize_t rc;
        const struct path *path;
 
-       rc = generic_file_splice_read(in, ppos, pipe, len, flags);
+       rc = filemap_splice_read(in, ppos, pipe, len, flags);
        if (rc >= 0) {
                path = ecryptfs_dentry_to_lower_path(in->f_path.dentry);
                touch_atime(path);

diff --git a/fs/erofs/data.c b/fs/erofs/data.c
index 6fe9a779fa91643430ede2c84a4a7c1ff4899f66..db5e4b7636ec0f4284cc0e844e94efe6b58a4dde 100644 (file)
--- a/fs/erofs/data.c
+++ b/fs/erofs/data.c
@@ -448,5 +448,5 @@ const struct file_operations erofs_file_fops = {
        .llseek         = generic_file_llseek,
        .read_iter      = erofs_file_read_iter,
        .mmap           = erofs_file_mmap,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
 };

diff --git a/fs/exfat/file.c b/fs/exfat/file.c
index e99183a746117bd97955b6d48338207e74e50371..3cbd270e0cba6c4912e3d8c80f31c5b32bf58bab 100644 (file)
--- a/fs/exfat/file.c
+++ b/fs/exfat/file.c
@@ -389,7 +389,7 @@ const struct file_operations exfat_file_operations = {
 #endif
        .mmap           = generic_file_mmap,
        .fsync          = exfat_file_fsync,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,
 };
 

diff --git a/fs/ext2/file.c b/fs/ext2/file.c
index 6b4bebe982ca2f8ad91430ff46a887962317f49c..d1ae0f0a372649ce257233c11f68e443a34b972e 100644 (file)
--- a/fs/ext2/file.c
+++ b/fs/ext2/file.c
@@ -192,7 +192,7 @@ const struct file_operations ext2_file_operations = {
        .release        = ext2_release_file,
        .fsync          = ext2_fsync,
        .get_unmapped_area = thp_get_unmapped_area,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,
 };
 

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 9f8bbd9d131cfe54578d0565673ad4a838787f56..e8261900f4f3af4d955961c7101d48557cd5e657 100644 (file)
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -155,7 +155,7 @@ static ssize_t ext4_file_splice_read(struct file *in, loff_t *ppos,
 
        if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))
                return -EIO;
-       return generic_file_splice_read(in, ppos, pipe, len, flags);
+       return filemap_splice_read(in, ppos, pipe, len, flags);
 }
 
 /*

diff --git a/fs/fat/file.c b/fs/fat/file.c
index 795a4fad5c40986ee577d5ddde757a7e80a46cc8..456477946dd9e1c83d9b5e6507993530e551b86e 100644 (file)
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -209,7 +209,7 @@ const struct file_operations fat_file_operations = {
        .unlocked_ioctl = fat_generic_ioctl,
        .compat_ioctl   = compat_ptr_ioctl,
        .fsync          = fat_file_fsync,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,
        .fallocate      = fat_fallocate,
 };

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index 89d97f6188e05ee58a195c72a5e3936177ba2733..4553124f5406fc80cce95e36df9c3d1579400cf5 100644 (file)
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -3252,7 +3252,7 @@ static const struct file_operations fuse_file_operations = {
        .lock           = fuse_file_lock,
        .get_unmapped_area = thp_get_unmapped_area,
        .flock          = fuse_file_flock,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,
        .unlocked_ioctl = fuse_file_ioctl,
        .compat_ioctl   = fuse_file_compat_ioctl,

diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 300844f50dcd28246eb17c2e81d1fa3119a46b81..0f5ad516536113905a5a7e462fb9914ac754a73d 100644 (file)
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -1568,7 +1568,7 @@ const struct file_operations gfs2_file_fops = {
        .fsync          = gfs2_fsync,
        .lock           = gfs2_lock,
        .flock          = gfs2_flock,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = gfs2_file_splice_write,
        .setlease       = simple_nosetlease,
        .fallocate      = gfs2_fallocate,
@@ -1599,7 +1599,7 @@ const struct file_operations gfs2_file_fops_nolock = {
        .open           = gfs2_open,
        .release        = gfs2_release,
        .fsync          = gfs2_fsync,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = gfs2_file_splice_write,
        .setlease       = generic_setlease,
        .fallocate      = gfs2_fallocate,

diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 1f7bd068acf0acc86a9127859f6a88d60ae26da1..441d7fc952e3766d1cba9e63154557a57e5cf7e1 100644 (file)
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -694,7 +694,7 @@ static const struct file_operations hfs_file_operations = {
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
        .mmap           = generic_file_mmap,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .fsync          = hfs_file_fsync,
        .open           = hfs_file_open,
        .release        = hfs_file_release,

diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index b21660475ac1cc703428cabf1f953b1ea3fb095a..7d1a675e037d435d761fcc5d540d312d4c3c77e3 100644 (file)
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -372,7 +372,7 @@ static const struct file_operations hfsplus_file_operations = {
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
        .mmap           = generic_file_mmap,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .fsync          = hfsplus_file_fsync,
        .open           = hfsplus_file_open,
        .release        = hfsplus_file_release,

diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index 28b4f15c19eb03af3b5b598dac01ed70c2cb923e..87998df499f46af13e343744ca5834bce5e681df 100644 (file)
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -381,7 +381,7 @@ static int hostfs_fsync(struct file *file, loff_t start, loff_t end,
 
 static const struct file_operations hostfs_file_fops = {
        .llseek         = generic_file_llseek,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,

diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
index 88952d4a631e6cd34ca7e64f013a48aeaba6275b..1bb8d97cd9aef611ff8b9f8da658f1139b65aae9 100644 (file)
--- a/fs/hpfs/file.c
+++ b/fs/hpfs/file.c
@@ -259,7 +259,7 @@ const struct file_operations hpfs_file_ops =
        .mmap           = generic_file_mmap,
        .release        = hpfs_file_release,
        .fsync          = hpfs_file_fsync,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .unlocked_ioctl = hpfs_ioctl,
        .compat_ioctl   = compat_ptr_ioctl,
 };

diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 96b0275ce95747f3377dcd6ac0240735048ab70b..2345ca3f09eece4a67b507853876d370d17827a8 100644 (file)
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -56,7 +56,7 @@ const struct file_operations jffs2_file_operations =
        .unlocked_ioctl=jffs2_ioctl,
        .mmap =         generic_file_readonly_mmap,
        .fsync =        jffs2_fsync,
-       .splice_read =  generic_file_splice_read,
+       .splice_read =  filemap_splice_read,
        .splice_write = iter_file_splice_write,
 };
 

diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index 2ee35be49de128caec015a8e04fc579cedac7e24..01b6912e60f80891f148a0c2679f5a35e6d74586 100644 (file)
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -144,7 +144,7 @@ const struct file_operations jfs_file_operations = {
        .read_iter      = generic_file_read_iter,
        .write_iter     = generic_file_write_iter,
        .mmap           = generic_file_mmap,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,
        .fsync          = jfs_fsync,
        .release        = jfs_release,

diff --git a/fs/minix/file.c b/fs/minix/file.c
index 0dd05d47724af53317f6df69a8415dd2a1d6238c..906d192ab7f342964d5d6b08a2225543730b0e9d 100644 (file)
--- a/fs/minix/file.c
+++ b/fs/minix/file.c
@@ -19,7 +19,7 @@ const struct file_operations minix_file_operations = {
        .write_iter     = generic_file_write_iter,
        .mmap           = generic_file_mmap,
        .fsync          = generic_file_fsync,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
 };
 
 static int minix_setattr(struct mnt_idmap *idmap,

diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c
index a265d391ffe92dabd4da8a3d563706f7e267048b..a9eb3487efb2c2cfaccf4eb55be93affee9fa7b2 100644 (file)
--- a/fs/nilfs2/file.c
+++ b/fs/nilfs2/file.c
@@ -140,7 +140,7 @@ const struct file_operations nilfs_file_operations = {
        .open           = generic_file_open,
        /* .release     = nilfs_release_file, */
        .fsync          = nilfs_sync_file,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,
 };
 

diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index c481b14e4fd989cc9a01278f0f50bc7d44d7b902..e5e0ed58670b04f75ea7b08b7c9d1b54082e9050 100644 (file)
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -1992,7 +1992,7 @@ const struct file_operations ntfs_file_ops = {
 #endif /* NTFS_RW */
        .mmap           = generic_file_mmap,
        .open           = ntfs_file_open,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
 };
 
 const struct inode_operations ntfs_file_inode_ops = {

diff --git a/fs/ntfs3/file.c b/fs/ntfs3/file.c
index 667c9dc68b58944e839a18711e58abdeecee0bd7..036efd85f60c96fd877c36fac487851df6ab9922 100644 (file)
--- a/fs/ntfs3/file.c
+++ b/fs/ntfs3/file.c
@@ -770,7 +770,7 @@ static ssize_t ntfs_file_splice_read(struct file *in, loff_t *ppos,
                return -EOPNOTSUPP;
        }
 
-       return generic_file_splice_read(in, ppos, pipe, len, flags);
+       return filemap_splice_read(in, ppos, pipe, len, flags);
 }
 
 /*

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index 86add13b5f23978ea3502d034d87182ede6bd66c..42549fc81468a6f053a32c1010eea3ba457bbf18 100644 (file)
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -2827,7 +2827,7 @@ const struct file_operations ocfs2_fops_no_plocks = {
        .compat_ioctl   = ocfs2_compat_ioctl,
 #endif
        .flock          = ocfs2_flock,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,
        .fallocate      = ocfs2_fallocate,
        .remap_file_range = ocfs2_remap_file_range,

diff --git a/fs/omfs/file.c b/fs/omfs/file.c
index 0101f1f87b568f7d28d67829e4da87c259a31296..de8f57ee39ecdd7c50a437b02095ecf93969a710 100644 (file)
--- a/fs/omfs/file.c
+++ b/fs/omfs/file.c
@@ -334,7 +334,7 @@ const struct file_operations omfs_file_operations = {
        .write_iter = generic_file_write_iter,
        .mmap = generic_file_mmap,
        .fsync = generic_file_fsync,
-       .splice_read = generic_file_splice_read,
+       .splice_read = filemap_splice_read,
 };
 
 static int omfs_setattr(struct mnt_idmap *idmap,

diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c
index 12af0490322f9d8d5354258c35f8fe4a4762c9d9..c7a1aa3c882b021d28ff2d6c7522ddcc96cb9cc2 100644 (file)
--- a/fs/ramfs/file-mmu.c
+++ b/fs/ramfs/file-mmu.c
@@ -43,7 +43,7 @@ const struct file_operations ramfs_file_operations = {
        .write_iter     = generic_file_write_iter,
        .mmap           = generic_file_mmap,
        .fsync          = noop_fsync,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,
        .llseek         = generic_file_llseek,
        .get_unmapped_area      = ramfs_mmu_get_unmapped_area,

diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c
index 9fbb9b5256f755a71d829e4fee1bfd5082e5eaee..efb1b4c1a0a47a104b17ece678141d418343d343 100644 (file)
--- a/fs/ramfs/file-nommu.c
+++ b/fs/ramfs/file-nommu.c
@@ -43,7 +43,7 @@ const struct file_operations ramfs_file_operations = {
        .read_iter              = generic_file_read_iter,
        .write_iter             = generic_file_write_iter,
        .fsync                  = noop_fsync,
-       .splice_read            = generic_file_splice_read,
+       .splice_read            = filemap_splice_read,
        .splice_write           = iter_file_splice_write,
        .llseek                 = generic_file_llseek,
 };

diff --git a/fs/read_write.c b/fs/read_write.c
index a21ba3be7dbe73024125c2a4d619d65185456717..b07de77ef126e0872421258c97fc0a5cbee596a1 100644 (file)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -29,7 +29,7 @@ const struct file_operations generic_ro_fops = {
        .llseek         = generic_file_llseek,
        .read_iter      = generic_file_read_iter,
        .mmap           = generic_file_readonly_mmap,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
 };
 
 EXPORT_SYMBOL(generic_ro_fops);

diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index b54cc7048f0276dd1d2ac9e12f6bc4c2bcf5a87d..8eb3ad3e8ae92fd1a3ce47f6dc26b863b91046b1 100644 (file)
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -247,7 +247,7 @@ const struct file_operations reiserfs_file_operations = {
        .fsync = reiserfs_sync_file,
        .read_iter = generic_file_read_iter,
        .write_iter = generic_file_write_iter,
-       .splice_read = generic_file_splice_read,
+       .splice_read = filemap_splice_read,
        .splice_write = iter_file_splice_write,
        .llseek = generic_file_llseek,
 };

diff --git a/fs/romfs/mmap-nommu.c b/fs/romfs/mmap-nommu.c
index 4578dc45e50a66f3466f349386bafb0015e0a391..4520ca41386768df7a3f3c1ec56ba8e4d6b68d9b 100644 (file)
--- a/fs/romfs/mmap-nommu.c
+++ b/fs/romfs/mmap-nommu.c
@@ -78,7 +78,7 @@ static unsigned romfs_mmap_capabilities(struct file *file)
 const struct file_operations romfs_ro_fops = {
        .llseek                 = generic_file_llseek,
        .read_iter              = generic_file_read_iter,
-       .splice_read            = generic_file_splice_read,
+       .splice_read            = filemap_splice_read,
        .mmap                   = romfs_mmap,
        .get_unmapped_area      = romfs_get_unmapped_area,
        .mmap_capabilities      = romfs_mmap_capabilities,

diff --git a/fs/sysv/file.c b/fs/sysv/file.c
index 50eb92557a0feaf12564a71dd52213a9be9d8982..c645f60bdb7fe98d7edfabae2910d71702438189 100644 (file)
--- a/fs/sysv/file.c
+++ b/fs/sysv/file.c
@@ -26,7 +26,7 @@ const struct file_operations sysv_file_operations = {
        .write_iter     = generic_file_write_iter,
        .mmap           = generic_file_mmap,
        .fsync          = generic_file_fsync,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
 };
 
 static int sysv_setattr(struct mnt_idmap *idmap,

diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 979ab1d9d0c39ddf56ea9d9f8e1f5c2e4c30a3d3..6738fe43040b11d3c967673b37167722fd8f795c 100644 (file)
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -1669,7 +1669,7 @@ const struct file_operations ubifs_file_operations = {
        .mmap           = ubifs_file_mmap,
        .fsync          = ubifs_fsync,
        .unlocked_ioctl = ubifs_ioctl,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
        .splice_write   = iter_file_splice_write,
        .open           = fscrypt_file_open,
 #ifdef CONFIG_COMPAT

diff --git a/fs/udf/file.c b/fs/udf/file.c
index 8238f742377babf0216eea499f83cf202c7936de..29daf5d5cb67fb2f592bcffca2822dd5dc680452 100644 (file)
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -209,7 +209,7 @@ const struct file_operations udf_file_operations = {
        .write_iter             = udf_file_write_iter,
        .release                = udf_release_file,
        .fsync                  = generic_file_fsync,
-       .splice_read            = generic_file_splice_read,
+       .splice_read            = filemap_splice_read,
        .splice_write           = iter_file_splice_write,
        .llseek                 = generic_file_llseek,
 };

diff --git a/fs/ufs/file.c b/fs/ufs/file.c
index 7e087581be7e0c455923706499408766eb9deeb6..6558882a89ef4e5a89957c3f74cf620f27389a39 100644 (file)
--- a/fs/ufs/file.c
+++ b/fs/ufs/file.c
@@ -41,5 +41,5 @@ const struct file_operations ufs_file_operations = {
        .mmap           = generic_file_mmap,
        .open           = generic_file_open,
        .fsync          = generic_file_fsync,
-       .splice_read    = generic_file_splice_read,
+       .splice_read    = filemap_splice_read,
 };

diff --git a/fs/vboxsf/file.c b/fs/vboxsf/file.c
index 572aa1c43b37b9a9c47e967a8709fbe8adeba723..2307f8037efc3d3da4b6150fae4c42e125886005 100644 (file)
--- a/fs/vboxsf/file.c
+++ b/fs/vboxsf/file.c
@@ -217,7 +217,7 @@ const struct file_operations vboxsf_reg_fops = {
        .open = vboxsf_file_open,
        .release = vboxsf_file_release,
        .fsync = noop_fsync,
-       .splice_read = generic_file_splice_read,
+       .splice_read = filemap_splice_read,
 };
 
 const struct inode_operations vboxsf_reg_iops = {