summaryrefslogtreecommitdiff
path: root/fs/ext3/file.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-04-01 14:29:12 -0500
committerJeff Garzik <jeff@garzik.org>2006-04-01 14:29:12 -0500
commit6e07e16404deafadf45895a7d2aeb5feba53b479 (patch)
treea7025d6632f0b3eb6232eafba79f331ead812fcf /fs/ext3/file.c
parent08a556db919f67e1e4d33ae8d40f7222da34d994 (diff)
parente8e0619f68bff8f39d98c46aac85ed1d4557ccfd (diff)
Merge branch 'upstream'
Diffstat (limited to 'fs/ext3/file.c')
-rw-r--r--fs/ext3/file.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext3/file.c b/fs/ext3/file.c
index 783a796220bb..1efefb630ea9 100644
--- a/fs/ext3/file.c
+++ b/fs/ext3/file.c
@@ -119,6 +119,8 @@ const struct file_operations ext3_file_operations = {
.release = ext3_release_file,
.fsync = ext3_sync_file,
.sendfile = generic_file_sendfile,
+ .splice_read = generic_file_splice_read,
+ .splice_write = generic_file_splice_write,
};
struct inode_operations ext3_file_inode_operations = {