Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull second vfs update from Al Viro:
 "Now that net-next went in...  Here's the next big chunk - killing
  ->aio_read() and ->aio_write().

  There'll be one more pile today (direct_IO changes and
  generic_write_checks() cleanups/fixes), but I'd prefer to keep that
  one separate"

* 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: (37 commits)
  ->aio_read and ->aio_write removed
  pcm: another weird API abuse
  infinibad: weird APIs switched to ->write_iter()
  kill do_sync_read/do_sync_write
  fuse: use iov_iter_get_pages() for non-splice path
  fuse: switch to ->read_iter/->write_iter
  switch drivers/char/mem.c to ->read_iter/->write_iter
  make new_sync_{read,write}() static
  coredump: accept any write method
  switch /dev/loop to vfs_iter_write()
  serial2002: switch to __vfs_read/__vfs_write
  ashmem: use __vfs_read()
  export __vfs_read()
  autofs: switch to __vfs_write()
  new helper: __vfs_write()
  switch hugetlbfs to ->read_iter()
  coda: switch to ->read_iter/->write_iter
  ncpfs: switch to ->read_iter/->write_iter
  net/9p: remove (now-)unused helpers
  p9_client_attach(): set fid->uid correctly
  ...

1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index d1f168b73634..c4fd1e45ce1e 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -75,6 +75,7 @@
 #include <linux/sysfs.h>
 #include <linux/miscdevice.h>
 #include <linux/falloc.h>
+#include <linux/uio.h>
 #include "loop.h"
 
 #include <asm/uaccess.h>
@@ -229,13 +230,14 @@ lo_do_transfer(struct loop_device *lo, int cmd,
 static int __do_lo_send_write(struct file *file,
                 u8 *buf, const int len, loff_t pos)
 {
+        struct kvec kvec = {.iov_base = buf, .iov_len = len};
+        struct iov_iter from;
         ssize_t bw;
-        mm_segment_t old_fs = get_fs();
+
+        iov_iter_kvec(&from, ITER_KVEC | WRITE, &kvec, 1, len);
 
         file_start_write(file);
-        set_fs(get_ds());
-        bw = file->f_op->write(file, buf, len, &pos);
-        set_fs(old_fs);
+        bw = vfs_iter_write(file, &from, &pos);
         file_end_write(file);
         if (likely(bw == len))
                 return 0;
@@ -767,7 +769,7 @@ static int loop_set_fd(struct loop_device *lo, fmode_t mode,
                 goto out_putf;
 
         if (!(file->f_mode & FMODE_WRITE) || !(mode & FMODE_WRITE) ||
-            !file->f_op->write)
+            !file->f_op->write_iter)
                 lo_flags |= LO_FLAGS_READ_ONLY;
 
         lo_blocksize = S_ISBLK(inode->i_mode) ?