Commit 2cb1e089 authored by David Howells's avatar David Howells Committed by Jens Axboe
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChristian 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: default avatarJens Axboe <axboe@kernel.dk>
parent ab825131

block/fops.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

fs/adfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = {

fs/affs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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 = {

fs/afs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

fs/bfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -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,