Commit 5ffc4ef4 authored by Jens Axboe's avatar Jens Axboe
Browse files

sendfile: remove .sendfile from filesystems that use generic_file_sendfile() 



They can use generic_file_splice_read() instead. Since sys_sendfile() now
prefers that, there should be no change in behaviour.

Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent 534f2aaa

fs/adfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ const struct file_operations adfs_file_operations = { 
	.fsync		= file_fsync,

	.write		= do_sync_write,

	.aio_write	= generic_file_aio_write,

	.sendfile	= generic_file_sendfile,

	.splice_read	= generic_file_splice_read,

};



const struct inode_operations adfs_file_inode_operations = {

fs/affs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ const struct file_operations affs_file_operations = { 
	.open		= affs_file_open,

	.release	= affs_file_release,

	.fsync		= file_fsync,

	.sendfile	= generic_file_sendfile,

	.splice_read	= generic_file_splice_read,

};



const struct inode_operations affs_file_inode_operations = {

fs/afs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ const struct file_operations afs_file_operations = { 
	.aio_read	= generic_file_aio_read,

	.aio_write	= afs_file_write,

	.mmap		= generic_file_readonly_mmap,

	.sendfile	= generic_file_sendfile,

	.splice_read	= generic_file_splice_read,

	.fsync		= afs_fsync,

};

fs/bfs/file.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ const struct file_operations bfs_file_operations = { 
	.write		= do_sync_write,

	.aio_write	= generic_file_aio_write,

	.mmap		= generic_file_mmap,

	.sendfile	= generic_file_sendfile,

	.splice_read	= generic_file_splice_read,

};



static int bfs_move_block(unsigned long from, unsigned long to, struct super_block *sb)

fs/block_dev.c

+0 −1
Original line number Diff line number Diff line
@@ -1346,7 +1346,6 @@ const struct file_operations def_blk_fops = { 
#ifdef CONFIG_COMPAT

	.compat_ioctl	= compat_blkdev_ioctl,

#endif

	.sendfile	= generic_file_sendfile,

	.splice_read	= generic_file_splice_read,

	.splice_write	= generic_file_splice_write,

};