diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-02 08:51:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-02 08:51:26 -0800 |
| commit | 096e5bdaf166791e128ed3b9190542412559333b (patch) | |
| tree | 3095ed989020c0533f045b796fcb5bc6e672dfc6 /fs | |
| parent | eb193e405155c5680ca1560b040b1551566660f9 (diff) | |
| parent | 89f68225876db7df638de2884b561facb1870239 (diff) | |
| download | op-kernel-dev-096e5bdaf166791e128ed3b9190542412559333b.zip op-kernel-dev-096e5bdaf166791e128ed3b9190542412559333b.tar.gz | |
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
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/jfs/file.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/jfs/file.c b/fs/jfs/file.c index 34181b8..aa9132d 100644 --- 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, |
