Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6-omap-h63xx.git] / fs / hpfs / file.c

diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
index d9eb19b7b8aecef05ef1d49d0a12feca4b184755..8b94d24855f00b7ece487dc2b1cd5b5a741af0db 100644 (file)
--- a/fs/hpfs/file.c
+++ b/fs/hpfs/file.c
@@ -113,7 +113,7 @@ static ssize_t hpfs_file_write(struct file *file, const char __user *buf,
 {
        ssize_t retval;
 
-       retval = generic_file_write(file, buf, count, ppos);
+       retval = do_sync_write(file, buf, count, ppos);
        if (retval > 0)
                hpfs_i(file->f_dentry->d_inode)->i_dirty = 1;
        return retval;
@@ -122,8 +122,10 @@ static ssize_t hpfs_file_write(struct file *file, const char __user *buf,
 const struct file_operations hpfs_file_ops =
 {
        .llseek         = generic_file_llseek,
-       .read           = generic_file_read,
+       .read           = do_sync_read,
+       .aio_read       = generic_file_aio_read,
        .write          = hpfs_file_write,
+       .aio_write      = generic_file_aio_write,
        .mmap           = generic_file_mmap,
        .release        = hpfs_file_release,
        .fsync          = hpfs_file_fsync,