summaryrefslogtreecommitdiffstats
path: root/fs/reiserfs/file.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-03-31 10:03:19 -0500
committerJeff Garzik <jeff@garzik.org>2006-03-31 10:03:19 -0500
commitea19006f583b2128ce8338e6bb43aa0eb724a4b9 (patch)
tree4c859976b6acc1301d2c8822be6f21b0381f45fc /fs/reiserfs/file.c
parent8b316a3973f05e572b4edeeda9072987f6bbaa44 (diff)
parenta0f067802576d4eb4c65d40b8ee7d6ea3c81dd61 (diff)
Merge branch 'master'
Diffstat (limited to 'fs/reiserfs/file.c')
-rw-r--r--fs/reiserfs/file.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 010094d14da..cf6e1cf4035 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -1576,6 +1576,8 @@ const struct file_operations reiserfs_file_operations = {
.sendfile = generic_file_sendfile,
.aio_read = generic_file_aio_read,
.aio_write = reiserfs_aio_write,
+ .splice_read = generic_file_splice_read,
+ .splice_write = generic_file_splice_write,
};
struct inode_operations reiserfs_file_inode_operations = {