diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-01 14:29:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-01 14:29:12 -0500 |
| commit | 6e07e16404deafadf45895a7d2aeb5feba53b479 (patch) | |
| tree | a7025d6632f0b3eb6232eafba79f331ead812fcf /fs/ext2/file.c | |
| parent | 08a556db919f67e1e4d33ae8d40f7222da34d994 (diff) | |
| parent | e8e0619f68bff8f39d98c46aac85ed1d4557ccfd (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'fs/ext2/file.c')
| -rw-r--r-- | fs/ext2/file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ext2/file.c b/fs/ext2/file.c index 509cceca04db..23e2c7ccec1d 100644 --- a/fs/ext2/file.c +++ b/fs/ext2/file.c | |||
| @@ -53,6 +53,8 @@ const struct file_operations ext2_file_operations = { | |||
| 53 | .readv = generic_file_readv, | 53 | .readv = generic_file_readv, |
| 54 | .writev = generic_file_writev, | 54 | .writev = generic_file_writev, |
| 55 | .sendfile = generic_file_sendfile, | 55 | .sendfile = generic_file_sendfile, |
| 56 | .splice_read = generic_file_splice_read, | ||
| 57 | .splice_write = generic_file_splice_write, | ||
| 56 | }; | 58 | }; |
| 57 | 59 | ||
| 58 | #ifdef CONFIG_EXT2_FS_XIP | 60 | #ifdef CONFIG_EXT2_FS_XIP |