diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 09:55:48 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-11 09:55:48 -0400 |
| commit | db1b39d8b860e3716620c225bc86e0ec41764e34 (patch) | |
| tree | 8739074db733ef767400ea92cfbfed9352ddb92d /fs/hostfs/hostfs_kern.c | |
| parent | a6bc432e296dfa1f05d4b586ca5ca3085a2d42d7 (diff) | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/hostfs/hostfs_kern.c')
| -rw-r--r-- | fs/hostfs/hostfs_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 8286491dbf31..c77862032e84 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c | |||
| @@ -390,7 +390,7 @@ int hostfs_fsync(struct file *file, struct dentry *dentry, int datasync) | |||
| 390 | static const struct file_operations hostfs_file_fops = { | 390 | static const struct file_operations hostfs_file_fops = { |
| 391 | .llseek = generic_file_llseek, | 391 | .llseek = generic_file_llseek, |
| 392 | .read = do_sync_read, | 392 | .read = do_sync_read, |
| 393 | .sendfile = generic_file_sendfile, | 393 | .splice_read = generic_file_splice_read, |
| 394 | .aio_read = generic_file_aio_read, | 394 | .aio_read = generic_file_aio_read, |
| 395 | .aio_write = generic_file_aio_write, | 395 | .aio_write = generic_file_aio_write, |
| 396 | .write = do_sync_write, | 396 | .write = do_sync_write, |