diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-01 18:33:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-05-01 18:33:40 -0700 |
| commit | 9817d207dc13e3a9fc0287bbd36bdfa3cffe5ed4 (patch) | |
| tree | 38f87e68f1cd36159fe5b9c03e9047b2fe374324 /fs/block_dev.c | |
| parent | cf105601df49ba0ea5ac04a6154c6c1442994c74 (diff) | |
| parent | 7afa6fd037e51e95d322990cb127bb2b1217251a (diff) | |
| download | op-kernel-dev-9817d207dc13e3a9fc0287bbd36bdfa3cffe5ed4.zip op-kernel-dev-9817d207dc13e3a9fc0287bbd36bdfa3cffe5ed4.tar.gz | |
Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block
* 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
[PATCH] vmsplice: allow user to pass in gift pages
[PATCH] pipe: enable atomic copying of pipe data to/from user space
[PATCH] splice: call handle_ra_miss() on failure to lookup page
[PATCH] Add ->splice_read/splice_write to def_blk_fops
[PATCH] pipe: introduce ->pin() buffer operation
[PATCH] splice: fix bugs in pipe_to_file()
[PATCH] splice: fix bugs with stealing regular pipe pages
Diffstat (limited to 'fs/block_dev.c')
| -rw-r--r-- | fs/block_dev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/block_dev.c b/fs/block_dev.c index af88c43..f5958f4 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c @@ -1104,6 +1104,8 @@ const struct file_operations def_blk_fops = { .readv = generic_file_readv, .writev = generic_file_write_nolock, .sendfile = generic_file_sendfile, + .splice_read = generic_file_splice_read, + .splice_write = generic_file_splice_write, }; int ioctl_by_bdev(struct block_device *bdev, unsigned cmd, unsigned long arg) |
