diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 12:45:08 (GMT) |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-10-02 12:45:08 (GMT) |
commit | 59458f40e25915a355d8b1d701425fe9f4f9ea23 (patch) | |
tree | f1c9a2934df686e36d75f759ab7313b6f0e0e5f9 /fs/affs | |
parent | 825f9075d74028d11d7f5932f04e1b5db3022b51 (diff) | |
parent | d834c16516d1ebec4766fc58c059bf01311e6045 (diff) | |
download | linux-fsl-qoriq-59458f40e25915a355d8b1d701425fe9f4f9ea23.tar.xz |
Merge branch 'master' into gfs2
Diffstat (limited to 'fs/affs')
-rw-r--r-- | fs/affs/file.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/affs/file.c b/fs/affs/file.c index 3de8590..05b5e22 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c @@ -27,8 +27,10 @@ static int affs_file_release(struct inode *inode, struct file *filp); const struct file_operations affs_file_operations = { .llseek = generic_file_llseek, - .read = generic_file_read, - .write = generic_file_write, + .read = do_sync_read, + .aio_read = generic_file_aio_read, + .write = do_sync_write, + .aio_write = generic_file_aio_write, .mmap = generic_file_mmap, .open = affs_file_open, .release = affs_file_release, |