Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

…/git/shaggy/jfs-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6: jfs: Add splice support
mariux64 · Nov 2, 2006 · 096e5bd · 096e5bd
2 parents eb193e4 + 89f6822
commit 096e5bd
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/fs/jfs/file.c b/fs/jfs/file.c
@@ -109,6 +109,8 @@ const struct file_operations jfs_file_operations = {
 	.aio_write	= generic_file_aio_write,
 	.mmap		= generic_file_mmap,
 	.sendfile	= generic_file_sendfile,
+	.splice_read	= generic_file_splice_read,
+	.splice_write	= generic_file_splice_write,
 	.fsync		= jfs_fsync,
 	.release	= jfs_release,
 	.ioctl		= jfs_ioctl,