Merge remote-tracking branch 'asoc/fix/rcar' into asoc-rcar

[karo-tx-linux.git] / fs / ecryptfs / file.c

diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index b32827c917e1f0820fd609c0527c7a4a0693e4eb..db0fad3269c0395f230c39cc0fcd6c9975f6d633 100644 (file)
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -353,8 +353,8 @@ const struct file_operations ecryptfs_main_fops = {
        .llseek = generic_file_llseek,
        .read = new_sync_read,
        .read_iter = ecryptfs_read_update_atime,
-       .write = do_sync_write,
-       .aio_write = generic_file_aio_write,
+       .write = new_sync_write,
+       .write_iter = generic_file_write_iter,
        .iterate = ecryptfs_readdir,
        .unlocked_ioctl = ecryptfs_unlocked_ioctl,
 #ifdef CONFIG_COMPAT