29 files changed, 94 insertions, 79 deletions

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 47e0597d1e9b..b9b5f979a2ca 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -763,7 +763,7 @@ err_out:
 
 buff_write:
         mutex_unlock(&inode->i_mutex);
-        return do_sync_write(filp, data, count, offsetp);
+        return new_sync_write(filp, data, count, offsetp);
 }
 
 /**
@@ -781,7 +781,7 @@ v9fs_cached_file_write(struct file *filp, const char __user * data,
 
         if (filp->f_flags & O_DIRECT)
                 return v9fs_direct_write(filp, data, count, offset);
-        return do_sync_write(filp, data, count, offset);
+        return new_sync_write(filp, data, count, offset);
 }
 
 
@@ -851,7 +851,7 @@ const struct file_operations v9fs_cached_file_operations = {
         .read = v9fs_cached_file_read,
         .write = v9fs_cached_file_write,
         .read_iter = generic_file_read_iter,
-        .aio_write = generic_file_aio_write,
+        .write_iter = generic_file_write_iter,
         .open = v9fs_file_open,
         .release = v9fs_dir_release,
         .lock = v9fs_file_lock,
@@ -864,7 +864,7 @@ const struct file_operations v9fs_cached_file_operations_dotl = {
         .read = v9fs_cached_file_read,
         .write = v9fs_cached_file_write,
         .read_iter = generic_file_read_iter,
-        .aio_write = generic_file_aio_write,
+        .write_iter = generic_file_write_iter,
         .open = v9fs_file_open,
         .release = v9fs_dir_release,
         .lock = v9fs_file_lock_dotl,
diff --git a/fs/adfs/file.c b/fs/adfs/file.c
index 3bfc9efa29b4..07c9edce5aa7 100644
--- a/fs/adfs/file.c
+++ b/fs/adfs/file.c
@@ -27,8 +27,8 @@ const struct file_operations adfs_file_operations = {
         .read_iter      = generic_file_read_iter,
         .mmap           = generic_file_mmap,
         .fsync          = generic_file_fsync,
-        .write          = do_sync_write,
-        .aio_write      = generic_file_aio_write,
+        .write          = new_sync_write,
+        .write_iter     = generic_file_write_iter,
         .splice_read    = generic_file_splice_read,
 };
 
diff --git a/fs/affs/file.c b/fs/affs/file.c
index 982853f17afc..9df23175e28b 100644
--- a/fs/affs/file.c
+++ b/fs/affs/file.c
@@ -29,8 +29,8 @@ const struct file_operations affs_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
         .read_iter      = generic_file_read_iter,
-        .write          = do_sync_write,
-        .aio_write      = generic_file_aio_write,
+        .write          = new_sync_write,
+        .write_iter     = generic_file_write_iter,
         .mmap           = generic_file_mmap,
         .open           = affs_file_open,
         .release        = affs_file_release,
diff --git a/fs/bfs/file.c b/fs/bfs/file.c
index 0aa788892f93..e7f88ace1a25 100644
--- a/fs/bfs/file.c
+++ b/fs/bfs/file.c
@@ -25,8 +25,8 @@ const struct file_operations bfs_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
         .read_iter      = generic_file_read_iter,
-        .write          = do_sync_write,
-        .aio_write      = generic_file_aio_write,
+        .write          = new_sync_write,
+        .write_iter     = generic_file_write_iter,
         .mmap           = generic_file_mmap,
         .splice_read    = generic_file_splice_read,
 };
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index b32827c917e1..db0fad3269c0 100644
--- 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
diff --git a/fs/exofs/file.c b/fs/exofs/file.c
index 90d394da7471..5b7f6be5a2d5 100644
--- a/fs/exofs/file.c
+++ b/fs/exofs/file.c
@@ -68,9 +68,9 @@ static int exofs_flush(struct file *file, fl_owner_t id)
 const struct file_operations exofs_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
-        .write          = do_sync_write,
+        .write          = new_sync_write,
         .read_iter      = generic_file_read_iter,
-        .aio_write      = generic_file_aio_write,
+        .write_iter     = generic_file_write_iter,
         .mmap           = generic_file_mmap,
         .open           = generic_file_open,
         .release        = exofs_release_file,
diff --git a/fs/ext2/file.c b/fs/ext2/file.c
index 407305072597..970c6aca15cc 100644
--- a/fs/ext2/file.c
+++ b/fs/ext2/file.c
@@ -63,9 +63,9 @@ int ext2_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 const struct file_operations ext2_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
-        .write          = do_sync_write,
+        .write          = new_sync_write,
         .read_iter      = generic_file_read_iter,
-        .aio_write      = generic_file_aio_write,
+        .write_iter     = generic_file_write_iter,
         .unlocked_ioctl = ext2_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = ext2_compat_ioctl,
diff --git a/fs/ext3/file.c b/fs/ext3/file.c
index 5439d2f0141b..c833b1226d4d 100644
--- a/fs/ext3/file.c
+++ b/fs/ext3/file.c
@@ -51,9 +51,9 @@ static int ext3_release_file (struct inode * inode, struct file * filp)
 const struct file_operations ext3_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
-        .write          = do_sync_write,
+        .write          = new_sync_write,
         .read_iter      = generic_file_read_iter,
-        .aio_write      = generic_file_aio_write,
+        .write_iter     = generic_file_write_iter,
         .unlocked_ioctl = ext3_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = ext3_compat_ioctl,
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 0e01fb0bc97c..22f4900dd8eb 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -680,9 +680,9 @@ long f2fs_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 const struct file_operations f2fs_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
-        .write          = do_sync_write,
+        .write          = new_sync_write,
         .read_iter      = generic_file_read_iter,
-        .aio_write      = generic_file_aio_write,
+        .write_iter     = generic_file_write_iter,
         .open           = generic_file_open,
         .mmap           = f2fs_file_mmap,
         .fsync          = f2fs_sync_file,
diff --git a/fs/fat/file.c b/fs/fat/file.c
index 29285e990c90..85f79a89e747 100644
--- a/fs/fat/file.c
+++ b/fs/fat/file.c
@@ -171,9 +171,9 @@ int fat_file_fsync(struct file *filp, loff_t start, loff_t end, int datasync)
 const struct file_operations fat_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
-        .write          = do_sync_write,
+        .write          = new_sync_write,
         .read_iter      = generic_file_read_iter,
-        .aio_write      = generic_file_aio_write,
+        .write_iter     = generic_file_write_iter,
         .mmap           = generic_file_mmap,
         .release        = fat_file_release,
         .unlocked_ioctl = fat_generic_ioctl,
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c
index 6d4055aff109..d0929bc81782 100644
--- a/fs/hfs/inode.c
+++ b/fs/hfs/inode.c
@@ -676,8 +676,8 @@ static const struct file_operations hfs_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
         .read_iter      = generic_file_read_iter,
-        .write          = do_sync_write,
-        .aio_write      = generic_file_aio_write,
+        .write          = new_sync_write,
+        .write_iter     = generic_file_write_iter,
         .mmap           = generic_file_mmap,
         .splice_read    = generic_file_splice_read,
         .fsync          = hfs_file_fsync,
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c
index cccc89e47cb6..0cf786f2d046 100644
--- a/fs/hfsplus/inode.c
+++ b/fs/hfsplus/inode.c
@@ -343,8 +343,8 @@ static const struct file_operations hfsplus_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
         .read_iter      = generic_file_read_iter,
-        .write          = do_sync_write,
-        .aio_write      = generic_file_aio_write,
+        .write          = new_sync_write,
+        .write_iter     = generic_file_write_iter,
         .mmap           = generic_file_mmap,
         .splice_read    = generic_file_splice_read,
         .fsync          = hfsplus_file_fsync,
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c
index ce0005d8ffeb..bb529f3b7f2b 100644
--- a/fs/hostfs/hostfs_kern.c
+++ b/fs/hostfs/hostfs_kern.c
@@ -381,8 +381,8 @@ static const struct file_operations hostfs_file_fops = {
         .read           = new_sync_read,
         .splice_read    = generic_file_splice_read,
         .read_iter      = generic_file_read_iter,
-        .aio_write      = generic_file_aio_write,
-        .write          = do_sync_write,
+        .write_iter     = generic_file_write_iter,
+        .write          = new_sync_write,
         .mmap           = generic_file_mmap,
         .open           = hostfs_file_open,
         .release        = hostfs_file_release,
diff --git a/fs/hpfs/file.c b/fs/hpfs/file.c
index bacb478a4990..7f54e5f76cec 100644
--- a/fs/hpfs/file.c
+++ b/fs/hpfs/file.c
@@ -199,8 +199,8 @@ const struct file_operations hpfs_file_ops =
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
         .read_iter      = generic_file_read_iter,
-        .write          = do_sync_write,
-        .aio_write      = generic_file_aio_write,
+        .write          = new_sync_write,
+        .write_iter     = generic_file_write_iter,
         .mmap           = generic_file_mmap,
         .release        = hpfs_file_release,
         .fsync          = hpfs_file_fsync,
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c
index 9192127d591c..64989ca9ba90 100644
--- a/fs/jffs2/file.c
+++ b/fs/jffs2/file.c
@@ -53,8 +53,8 @@ const struct file_operations jffs2_file_operations =
         .open =         generic_file_open,
         .read =         new_sync_read,
         .read_iter =    generic_file_read_iter,
-        .write =        do_sync_write,
-        .aio_write =    generic_file_aio_write,
+        .write =        new_sync_write,
+        .write_iter =   generic_file_write_iter,
         .unlocked_ioctl=jffs2_ioctl,
         .mmap =         generic_file_readonly_mmap,
         .fsync =        jffs2_fsync,
diff --git a/fs/jfs/file.c b/fs/jfs/file.c
index a5d8299b2208..cc744ecaf51f 100644
--- a/fs/jfs/file.c
+++ b/fs/jfs/file.c
@@ -151,10 +151,10 @@ const struct inode_operations jfs_file_inode_operations = {
 const struct file_operations jfs_file_operations = {
         .open           = jfs_open,
         .llseek         = generic_file_llseek,
-        .write          = do_sync_write,
+        .write          = new_sync_write,
         .read           = new_sync_read,
         .read_iter      = generic_file_read_iter,
-        .aio_write      = generic_file_aio_write,
+        .write_iter     = generic_file_write_iter,
         .mmap           = generic_file_mmap,
         .splice_read    = generic_file_splice_read,
         .splice_write   = generic_file_splice_write,
diff --git a/fs/logfs/file.c b/fs/logfs/file.c
index 1ca8026dc664..8538752df2f6 100644
--- a/fs/logfs/file.c
+++ b/fs/logfs/file.c
@@ -265,14 +265,14 @@ const struct inode_operations logfs_reg_iops = {
 
 const struct file_operations logfs_reg_fops = {
         .read_iter      = generic_file_read_iter,
-        .aio_write      = generic_file_aio_write,
+        .write_iter     = generic_file_write_iter,
         .fsync          = logfs_fsync,
         .unlocked_ioctl = logfs_ioctl,
         .llseek         = generic_file_llseek,
         .mmap           = generic_file_readonly_mmap,
         .open           = generic_file_open,
         .read           = new_sync_read,
-        .write          = do_sync_write,
+        .write          = new_sync_write,
 };
 
 const struct address_space_operations logfs_reg_aops = {
diff --git a/fs/minix/file.c b/fs/minix/file.c
index 607b47145325..a967de085ac0 100644
--- a/fs/minix/file.c
+++ b/fs/minix/file.c
@@ -16,8 +16,8 @@ const struct file_operations minix_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
         .read_iter      = generic_file_read_iter,
-        .write          = do_sync_write,
-        .aio_write      = generic_file_aio_write,
+        .write          = new_sync_write,
+        .write_iter     = generic_file_write_iter,
         .mmap           = generic_file_mmap,
         .fsync          = generic_file_fsync,
         .splice_read    = generic_file_splice_read,
diff --git a/fs/nilfs2/file.c b/fs/nilfs2/file.c
index dcb1b0e8b435..24978153c0c4 100644
--- a/fs/nilfs2/file.c
+++ b/fs/nilfs2/file.c
@@ -153,9 +153,9 @@ static int nilfs_file_mmap(struct file *file, struct vm_area_struct *vma)
 const struct file_operations nilfs_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
-        .write          = do_sync_write,
+        .write          = new_sync_write,
         .read_iter      = generic_file_read_iter,
-        .aio_write      = generic_file_aio_write,
+        .write_iter     = generic_file_write_iter,
         .unlocked_ioctl = nilfs_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl   = nilfs_compat_ioctl,
diff --git a/fs/omfs/file.c b/fs/omfs/file.c
index 3bf28da9f0df..902e88527fce 100644
--- a/fs/omfs/file.c
+++ b/fs/omfs/file.c
@@ -338,9 +338,9 @@ static sector_t omfs_bmap(struct address_space *mapping, sector_t block)
 const struct file_operations omfs_file_operations = {
         .llseek = generic_file_llseek,
         .read = new_sync_read,
-        .write = do_sync_write,
+        .write = new_sync_write,
         .read_iter = generic_file_read_iter,
-        .aio_write = generic_file_aio_write,
+        .write_iter = generic_file_write_iter,
         .mmap = generic_file_mmap,
         .fsync = generic_file_fsync,
         .splice_read = generic_file_splice_read,
diff --git a/fs/ramfs/file-mmu.c b/fs/ramfs/file-mmu.c
index 30ffb367bc0b..6ea0b9718a9d 100644
--- a/fs/ramfs/file-mmu.c
+++ b/fs/ramfs/file-mmu.c
@@ -33,8 +33,8 @@
 const struct file_operations ramfs_file_operations = {
         .read           = new_sync_read,
         .read_iter      = generic_file_read_iter,
-        .write          = do_sync_write,
-        .aio_write      = generic_file_aio_write,
+        .write          = new_sync_write,
+        .write_iter     = generic_file_write_iter,
         .mmap           = generic_file_mmap,
         .fsync          = noop_fsync,
         .splice_read    = generic_file_splice_read,
diff --git a/fs/ramfs/file-nommu.c b/fs/ramfs/file-nommu.c
index 416db04f8464..9ed420f8f3ca 100644
--- a/fs/ramfs/file-nommu.c
+++ b/fs/ramfs/file-nommu.c
@@ -39,8 +39,8 @@ const struct file_operations ramfs_file_operations = {
         .get_unmapped_area      = ramfs_nommu_get_unmapped_area,
         .read                   = new_sync_read,
         .read_iter              = generic_file_read_iter,
-        .write                  = do_sync_write,
-        .aio_write              = generic_file_aio_write,
+        .write                  = new_sync_write,
+        .write_iter             = generic_file_write_iter,
         .fsync                  = noop_fsync,
         .splice_read            = generic_file_splice_read,
         .splice_write           = generic_file_splice_write,
diff --git a/fs/reiserfs/file.c b/fs/reiserfs/file.c
index 7592d681fd8c..7c8ecd6468db 100644
--- a/fs/reiserfs/file.c
+++ b/fs/reiserfs/file.c
@@ -236,7 +236,7 @@ int reiserfs_commit_page(struct inode *inode, struct page *page,
 
 const struct file_operations reiserfs_file_operations = {
         .read = new_sync_read,
-        .write = do_sync_write,
+        .write = new_sync_write,
         .unlocked_ioctl = reiserfs_ioctl,
 #ifdef CONFIG_COMPAT
         .compat_ioctl = reiserfs_compat_ioctl,
@@ -246,7 +246,7 @@ const struct file_operations reiserfs_file_operations = {
         .release = reiserfs_file_release,
         .fsync = reiserfs_sync_file,
         .read_iter = generic_file_read_iter,
-        .aio_write = generic_file_aio_write,
+        .write_iter = generic_file_write_iter,
         .splice_read = generic_file_splice_read,
         .splice_write = generic_file_splice_write,
         .llseek = generic_file_llseek,
diff --git a/fs/sysv/file.c b/fs/sysv/file.c
index d99be8877388..b00811c75b24 100644
--- a/fs/sysv/file.c
+++ b/fs/sysv/file.c
@@ -23,8 +23,8 @@ const struct file_operations sysv_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
         .read_iter      = generic_file_read_iter,
-        .write          = do_sync_write,
-        .aio_write      = generic_file_aio_write,
+        .write          = new_sync_write,
+        .write_iter     = generic_file_write_iter,
         .mmap           = generic_file_mmap,
         .fsync          = generic_file_fsync,
         .splice_read    = generic_file_splice_read,
diff --git a/fs/ufs/file.c b/fs/ufs/file.c
index b6b402989e6b..c84ec010a676 100644
--- a/fs/ufs/file.c
+++ b/fs/ufs/file.c
@@ -37,8 +37,8 @@ const struct file_operations ufs_file_operations = {
         .llseek         = generic_file_llseek,
         .read           = new_sync_read,
         .read_iter      = generic_file_read_iter,
-        .write          = do_sync_write,
-        .aio_write      = generic_file_aio_write,
+        .write          = new_sync_write,
+        .write_iter     = generic_file_write_iter,
         .mmap           = generic_file_mmap,
         .open           = generic_file_open,
         .fsync          = generic_file_fsync,
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 17535e0a4547..4b221637f09e 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2414,7 +2414,9 @@ int generic_write_checks(struct file *file, loff_t *pos, size_t *count, int isbl
 extern ssize_t generic_file_aio_read(struct kiocb *, const struct iovec *, unsigned long, loff_t);
 extern ssize_t generic_file_read_iter(struct kiocb *, struct iov_iter *);
 extern ssize_t __generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long);
+extern ssize_t __generic_file_write_iter(struct kiocb *, struct iov_iter *);
 extern ssize_t generic_file_aio_write(struct kiocb *, const struct iovec *, unsigned long, loff_t);
+extern ssize_t generic_file_write_iter(struct kiocb *, struct iov_iter *);
 extern ssize_t generic_file_direct_write(struct kiocb *, struct iov_iter *, loff_t);
 extern ssize_t generic_perform_write(struct file *, struct iov_iter *, loff_t);
 extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
diff --git a/mm/filemap.c b/mm/filemap.c
index c0404b763a17..d2d9eeec8bf0 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2542,10 +2542,9 @@ again:
 EXPORT_SYMBOL(generic_perform_write);
 
 /**
- * __generic_file_aio_write - write data to a file
+ * __generic_file_write_iter - write data to a file
  * @iocb:       IO state structure (file, offset, etc.)
- * @iov:        vector with data to write
- * @nr_segs:    number of segments in the vector
+ * @from:       iov_iter with data to write
  *
  * This function does all the work needed for actually writing data to a
  * file. It does all basic checks, removes SUID from the file, updates
@@ -2559,21 +2558,16 @@ EXPORT_SYMBOL(generic_perform_write);
  * A caller has to handle it. This is mainly due to the fact that we want to
  * avoid syncing under i_mutex.
  */
-ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
-                                 unsigned long nr_segs)
+ssize_t __generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
 {
         struct file *file = iocb->ki_filp;
         struct address_space * mapping = file->f_mapping;
-        size_t count;           /* after file limit checks */
         struct inode    *inode = mapping->host;
         loff_t          pos = iocb->ki_pos;
         ssize_t         written = 0;
         ssize_t         err;
         ssize_t         status;
-        struct iov_iter from;
-
-        count = iov_length(iov, nr_segs);
-        iov_iter_init(&from, WRITE, iov, nr_segs, count);
+        size_t          count = iov_iter_count(from);
 
         /* We can write back this queue in page reclaim */
         current->backing_dev_info = mapping->backing_dev_info;
@@ -2584,7 +2578,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
         if (count == 0)
                 goto out;
 
-        iov_iter_truncate(&from, count);
+        iov_iter_truncate(from, count);
 
         err = file_remove_suid(file);
         if (err)
@@ -2598,7 +2592,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
         if (unlikely(file->f_flags & O_DIRECT)) {
                 loff_t endbyte;
 
-                written = generic_file_direct_write(iocb, &from, pos);
+                written = generic_file_direct_write(iocb, from, pos);
                 if (written < 0 || written == count)
                         goto out;
 
@@ -2609,7 +2603,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                 pos += written;
                 count -= written;
 
-                status = generic_perform_write(file, &from, pos);
+                status = generic_perform_write(file, from, pos);
                 /*
                  * If generic_perform_write() returned a synchronous error
                  * then we want to return the number of bytes which were
@@ -2641,7 +2635,7 @@ ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
                          */
                 }
         } else {
-                written = generic_perform_write(file, &from, pos);
+                written = generic_perform_write(file, from, pos);
                 if (likely(written >= 0))
                         iocb->ki_pos = pos + written;
         }
@@ -2649,30 +2643,36 @@ out:
         current->backing_dev_info = NULL;
         return written ? written : err;
 }
+EXPORT_SYMBOL(__generic_file_write_iter);
+
+ssize_t __generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
+                                 unsigned long nr_segs)
+{
+        size_t count = iov_length(iov, nr_segs);
+        struct iov_iter from;
+
+        iov_iter_init(&from, WRITE, iov, nr_segs, count);
+        return __generic_file_write_iter(iocb, &from);
+}
 EXPORT_SYMBOL(__generic_file_aio_write);
 
 /**
- * generic_file_aio_write - write data to a file
+ * generic_file_write_iter - write data to a file
  * @iocb:       IO state structure
- * @iov:        vector with data to write
- * @nr_segs:    number of segments in the vector
- * @pos:        position in file where to write
+ * @from:       iov_iter with data to write
  *
- * This is a wrapper around __generic_file_aio_write() to be used by most
+ * This is a wrapper around __generic_file_write_iter() to be used by most
  * filesystems. It takes care of syncing the file in case of O_SYNC file
  * and acquires i_mutex as needed.
  */
-ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
-                unsigned long nr_segs, loff_t pos)
+ssize_t generic_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
 {
         struct file *file = iocb->ki_filp;
         struct inode *inode = file->f_mapping->host;
         ssize_t ret;
 
-        BUG_ON(iocb->ki_pos != pos);
-
         mutex_lock(&inode->i_mutex);
-        ret = __generic_file_aio_write(iocb, iov, nr_segs);
+        ret = __generic_file_write_iter(iocb, from);
         mutex_unlock(&inode->i_mutex);
 
         if (ret > 0) {
@@ -2684,6 +2684,19 @@ ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
         }
         return ret;
 }
+EXPORT_SYMBOL(generic_file_write_iter);
+
+ssize_t generic_file_aio_write(struct kiocb *iocb, const struct iovec *iov,
+                unsigned long nr_segs, loff_t pos)
+{
+        size_t count = iov_length(iov, nr_segs);
+        struct iov_iter from;
+
+        BUG_ON(iocb->ki_pos != pos);
+
+        iov_iter_init(&from, WRITE, iov, nr_segs, count);
+        return generic_file_write_iter(iocb, &from);
+}
 EXPORT_SYMBOL(generic_file_aio_write);
 
 /**
diff --git a/mm/shmem.c b/mm/shmem.c
index edc6c7e817e9..d3e5c6fc313c 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -2618,9 +2618,9 @@ static const struct file_operations shmem_file_operations = {
 #ifdef CONFIG_TMPFS
         .llseek         = shmem_file_llseek,
         .read           = new_sync_read,
-        .write          = do_sync_write,
+        .write          = new_sync_write,
         .read_iter      = shmem_file_read_iter,
-        .aio_write      = generic_file_aio_write,
+        .write_iter     = generic_file_write_iter,
         .fsync          = noop_fsync,
         .splice_read    = shmem_file_splice_read,
         .splice_write   = generic_file_splice_write,
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 32c661d66a45..9c2dba6ac685 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -458,7 +458,7 @@ static pageout_t pageout(struct page *page, struct address_space *mapping,
          * stalls if we need to run get_block().  We could test
          * PagePrivate for that.
          *
-         * If this process is currently in __generic_file_aio_write() against
+         * If this process is currently in __generic_file_write_iter() against
          * this page's queue, we can perform writeback even if that
          * will block.
          *