UBUNTU: SAUCE: (noup) Update spl to 0.6.5.10-1, zfs to 0.6.5.10-1ubuntu2

[mirror_ubuntu-artful-kernel.git] / zfs / module / zfs / zpl_file.c

diff --git a/zfs/module/zfs/zpl_file.c b/zfs/module/zfs/zpl_file.c
index 19e8a6278ebab5f3c5e32b523617db465d5468d7..8781d8ca96053fea7a9314c87260dc9e52af23ba 100644 (file)
--- a/zfs/module/zfs/zpl_file.c
+++ b/zfs/module/zfs/zpl_file.c
@@ -857,9 +857,15 @@ const struct file_operations zpl_file_operations = {
        .release        = zpl_release,
        .llseek         = zpl_llseek,
 #ifdef HAVE_VFS_RW_ITERATE
+#ifdef HAVE_NEW_SYNC_READ
+       .read           = new_sync_read,
+       .write          = new_sync_write,
+#endif
        .read_iter      = zpl_iter_read,
        .write_iter     = zpl_iter_write,
 #else
+       .read           = do_sync_read,
+       .write          = do_sync_write,
        .aio_read       = zpl_aio_read,
        .aio_write      = zpl_aio_write,
 #endif