1 files changed, 23 insertions, 26 deletions

diff --git a/net/socket.c b/net/socket.c
index 1bc4167e0da8..df92e4252749 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -95,10 +95,10 @@
 #include <linux/netfilter.h>
 
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
-static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf,
-                             size_t size, loff_t pos);
-static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *buf,
-                              size_t size, loff_t pos);
+static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
+                         unsigned long nr_segs, loff_t pos);
+static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov,
+                          unsigned long nr_segs, loff_t pos);
 static int sock_mmap(struct file *file, struct vm_area_struct *vma);
 
 static int sock_close(struct inode *inode, struct file *file);
@@ -664,7 +664,6 @@ static ssize_t sock_sendpage(struct file *file, struct page *page,
 }
 
 static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb,
-                                         char __user *ubuf, size_t size,
                                          struct sock_iocb *siocb)
 {
         if (!is_sync_kiocb(iocb)) {
@@ -675,16 +674,13 @@ static struct sock_iocb *alloc_sock_iocb(struct kiocb *iocb,
         }
 
         siocb->kiocb = iocb;
-        siocb->async_iov.iov_base = ubuf;
-        siocb->async_iov.iov_len = size;
-
         iocb->private = siocb;
         return siocb;
 }
 
 static ssize_t do_sock_read(struct msghdr *msg, struct kiocb *iocb,
-                            struct file *file, struct iovec *iov,
-                            unsigned long nr_segs)
+                struct file *file, const struct iovec *iov,
+                unsigned long nr_segs)
 {
         struct socket *sock = file->private_data;
         size_t size = 0;
@@ -715,32 +711,33 @@ static ssize_t sock_readv(struct file *file, const struct iovec *iov,
         init_sync_kiocb(&iocb, NULL);
         iocb.private = &siocb;
 
-        ret = do_sock_read(&msg, &iocb, file, (struct iovec *)iov, nr_segs);
+        ret = do_sock_read(&msg, &iocb, file, iov, nr_segs);
         if (-EIOCBQUEUED == ret)
                 ret = wait_on_sync_kiocb(&iocb);
         return ret;
 }
 
-static ssize_t sock_aio_read(struct kiocb *iocb, char __user *ubuf,
-                             size_t count, loff_t pos)
+static ssize_t sock_aio_read(struct kiocb *iocb, const struct iovec *iov,
+                                unsigned long nr_segs, loff_t pos)
 {
         struct sock_iocb siocb, *x;
 
         if (pos != 0)
                 return -ESPIPE;
-        if (count == 0)         /* Match SYS5 behaviour */
+
+        if (iocb->ki_left == 0) /* Match SYS5 behaviour */
                 return 0;
 
-        x = alloc_sock_iocb(iocb, ubuf, count, &siocb);
+
+        x = alloc_sock_iocb(iocb, &siocb);
         if (!x)
                 return -ENOMEM;
-        return do_sock_read(&x->async_msg, iocb, iocb->ki_filp,
-                            &x->async_iov, 1);
+        return do_sock_read(&x->async_msg, iocb, iocb->ki_filp, iov, nr_segs);
 }
 
 static ssize_t do_sock_write(struct msghdr *msg, struct kiocb *iocb,
-                             struct file *file, struct iovec *iov,
-                             unsigned long nr_segs)
+                        struct file *file, const struct iovec *iov,
+                        unsigned long nr_segs)
 {
         struct socket *sock = file->private_data;
         size_t size = 0;
@@ -773,28 +770,28 @@ static ssize_t sock_writev(struct file *file, const struct iovec *iov,
         init_sync_kiocb(&iocb, NULL);
         iocb.private = &siocb;
 
-        ret = do_sock_write(&msg, &iocb, file, (struct iovec *)iov, nr_segs);
+        ret = do_sock_write(&msg, &iocb, file, iov, nr_segs);
         if (-EIOCBQUEUED == ret)
                 ret = wait_on_sync_kiocb(&iocb);
         return ret;
 }
 
-static ssize_t sock_aio_write(struct kiocb *iocb, const char __user *ubuf,
-                              size_t count, loff_t pos)
+static ssize_t sock_aio_write(struct kiocb *iocb, const struct iovec *iov,
+                          unsigned long nr_segs, loff_t pos)
 {
         struct sock_iocb siocb, *x;
 
         if (pos != 0)
                 return -ESPIPE;
-        if (count == 0)         /* Match SYS5 behaviour */
+
+        if (iocb->ki_left == 0) /* Match SYS5 behaviour */
                 return 0;
 
-        x = alloc_sock_iocb(iocb, (void __user *)ubuf, count, &siocb);
+        x = alloc_sock_iocb(iocb, &siocb);
         if (!x)
                 return -ENOMEM;
 
-        return do_sock_write(&x->async_msg, iocb, iocb->ki_filp,
-                             &x->async_iov, 1);
+        return do_sock_write(&x->async_msg, iocb, iocb->ki_filp, iov, nr_segs);
 }
 
 /*