diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-03 08:30:35 -0400 |
| commit | edc4ff7c08e9885c40e60c4fb39fa42cc91a0602 (patch) | |
| tree | f375d28043dd4457428a841167dc93d760ba9a46 /fs/block_dev.c | |
| parent | cbb9a56177b16294ed347ba7fcb1c66c8adb5dc4 (diff) | |
| parent | e17df688f7064dae1417ce425dd1e4b71d24d63b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
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 af88c43043d5..f5958f413bd1 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c | |||
| @@ -1104,6 +1104,8 @@ const struct file_operations def_blk_fops = { | |||
| 1104 | .readv = generic_file_readv, | 1104 | .readv = generic_file_readv, |
| 1105 | .writev = generic_file_write_nolock, | 1105 | .writev = generic_file_write_nolock, |
| 1106 | .sendfile = generic_file_sendfile, | 1106 | .sendfile = generic_file_sendfile, |
| 1107 | .splice_read = generic_file_splice_read, | ||
| 1108 | .splice_write = generic_file_splice_write, | ||
| 1107 | }; | 1109 | }; |
| 1108 | 1110 | ||
| 1109 | int ioctl_by_bdev(struct block_device *bdev, unsigned cmd, unsigned long arg) | 1111 | int ioctl_by_bdev(struct block_device *bdev, unsigned cmd, unsigned long arg) |