1 files changed, 10 insertions, 27 deletions

diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index de8da6dee1b0..bc0face01d25 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -288,11 +288,10 @@ static inline size_t iov_total(const struct iovec *iv, unsigned long count)
         return len;
 }
 
-/* Writev */
-static ssize_t tun_chr_writev(struct file * file, const struct iovec *iv,
-                              unsigned long count, loff_t *pos)
+static ssize_t tun_chr_aio_write(struct kiocb *iocb, const struct iovec *iv,
+                              unsigned long count, loff_t pos)
 {
-        struct tun_struct *tun = file->private_data;
+        struct tun_struct *tun = iocb->ki_filp->private_data;
 
         if (!tun)
                 return -EBADFD;
@@ -302,14 +301,6 @@ static ssize_t tun_chr_writev(struct file * file, const struct iovec *iv,
         return tun_get_user(tun, (struct iovec *) iv, iov_total(iv, count));
 }
 
-/* Write */
-static ssize_t tun_chr_write(struct file * file, const char __user * buf,
-                             size_t count, loff_t *pos)
-{
-        struct iovec iv = { (void __user *) buf, count };
-        return tun_chr_writev(file, &iv, 1, pos);
-}
-
 /* Put packet to the user space buffer */
 static __inline__ ssize_t tun_put_user(struct tun_struct *tun,
                                        struct sk_buff *skb,
@@ -343,10 +334,10 @@ static __inline__ ssize_t tun_put_user(struct tun_struct *tun,
         return total;
 }
 
-/* Readv */
-static ssize_t tun_chr_readv(struct file *file, const struct iovec *iv,
-                            unsigned long count, loff_t *pos)
+static ssize_t tun_chr_aio_read(struct kiocb *iocb, const struct iovec *iv,
+                            unsigned long count, loff_t pos)
 {
+        struct file *file = iocb->ki_filp;
         struct tun_struct *tun = file->private_data;
         DECLARE_WAITQUEUE(wait, current);
         struct sk_buff *skb;
@@ -426,14 +417,6 @@ static ssize_t tun_chr_readv(struct file *file, const struct iovec *iv,
         return ret;
 }
 
-/* Read */
-static ssize_t tun_chr_read(struct file * file, char __user * buf,
-                            size_t count, loff_t *pos)
-{
-        struct iovec iv = { buf, count };
-        return tun_chr_readv(file, &iv, 1, pos);
-}
-
 static void tun_setup(struct net_device *dev)
 {
         struct tun_struct *tun = netdev_priv(dev);
@@ -764,10 +747,10 @@ static int tun_chr_close(struct inode *inode, struct file *file)
 static struct file_operations tun_fops = {
         .owner  = THIS_MODULE,
         .llseek = no_llseek,
-        .read   = tun_chr_read,
-        .readv  = tun_chr_readv,
-        .write  = tun_chr_write,
-        .writev = tun_chr_writev,
+        .read  = do_sync_read,
+        .aio_read  = tun_chr_aio_read,
+        .write = do_sync_write,
+        .aio_write = tun_chr_aio_write,
         .poll   = tun_chr_poll,
         .ioctl  = tun_chr_ioctl,
         .open   = tun_chr_open,