1 files changed, 22 insertions, 37 deletions

diff --git a/fs/pipe.c b/fs/pipe.c
index f3b6f71e9d0b..2e60e1c8815e 100644
--- a/fs/pipe.c
+++ b/fs/pipe.c
@@ -218,9 +218,10 @@ static struct pipe_buf_operations anon_pipe_buf_ops = {
 };
 
 static ssize_t
-pipe_readv(struct file *filp, const struct iovec *_iov,
-           unsigned long nr_segs, loff_t *ppos)
+pipe_read(struct kiocb *iocb, const struct iovec *_iov,
+           unsigned long nr_segs, loff_t pos)
 {
+        struct file *filp = iocb->ki_filp;
         struct inode *inode = filp->f_dentry->d_inode;
         struct pipe_inode_info *pipe;
         int do_wakeup;
@@ -330,17 +331,10 @@ redo:
 }
 
 static ssize_t
-pipe_read(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
-{
-        struct iovec iov = { .iov_base = buf, .iov_len = count };
-
-        return pipe_readv(filp, &iov, 1, ppos);
-}
-
-static ssize_t
-pipe_writev(struct file *filp, const struct iovec *_iov,
-            unsigned long nr_segs, loff_t *ppos)
+pipe_write(struct kiocb *iocb, const struct iovec *_iov,
+            unsigned long nr_segs, loff_t ppos)
 {
+        struct file *filp = iocb->ki_filp;
         struct inode *inode = filp->f_dentry->d_inode;
         struct pipe_inode_info *pipe;
         ssize_t ret;
@@ -510,15 +504,6 @@ out:
 }
 
 static ssize_t
-pipe_write(struct file *filp, const char __user *buf,
-           size_t count, loff_t *ppos)
-{
-        struct iovec iov = { .iov_base = (void __user *)buf, .iov_len = count };
-
-        return pipe_writev(filp, &iov, 1, ppos);
-}
-
-static ssize_t
 bad_pipe_r(struct file *filp, char __user *buf, size_t count, loff_t *ppos)
 {
         return -EBADF;
@@ -736,8 +721,8 @@ pipe_rdwr_open(struct inode *inode, struct file *filp)
  */
 const struct file_operations read_fifo_fops = {
         .llseek         = no_llseek,
-        .read           = pipe_read,
-        .readv          = pipe_readv,
+        .read           = do_sync_read,
+        .aio_read       = pipe_read,
         .write          = bad_pipe_w,
         .poll           = pipe_poll,
         .ioctl          = pipe_ioctl,
@@ -749,8 +734,8 @@ const struct file_operations read_fifo_fops = {
 const struct file_operations write_fifo_fops = {
         .llseek         = no_llseek,
         .read           = bad_pipe_r,
-        .write          = pipe_write,
-        .writev         = pipe_writev,
+        .write          = do_sync_write,
+        .aio_write      = pipe_write,
         .poll           = pipe_poll,
         .ioctl          = pipe_ioctl,
         .open           = pipe_write_open,
@@ -760,10 +745,10 @@ const struct file_operations write_fifo_fops = {
 
 const struct file_operations rdwr_fifo_fops = {
         .llseek         = no_llseek,
-        .read           = pipe_read,
-        .readv          = pipe_readv,
-        .write          = pipe_write,
-        .writev         = pipe_writev,
+        .read           = do_sync_read,
+        .aio_read       = pipe_read,
+        .write          = do_sync_write,
+        .aio_write      = pipe_write,
         .poll           = pipe_poll,
         .ioctl          = pipe_ioctl,
         .open           = pipe_rdwr_open,
@@ -773,8 +758,8 @@ const struct file_operations rdwr_fifo_fops = {
 
 static struct file_operations read_pipe_fops = {
         .llseek         = no_llseek,
-        .read           = pipe_read,
-        .readv          = pipe_readv,
+        .read           = do_sync_read,
+        .aio_read       = pipe_read,
         .write          = bad_pipe_w,
         .poll           = pipe_poll,
         .ioctl          = pipe_ioctl,
@@ -786,8 +771,8 @@ static struct file_operations read_pipe_fops = {
 static struct file_operations write_pipe_fops = {
         .llseek         = no_llseek,
         .read           = bad_pipe_r,
-        .write          = pipe_write,
-        .writev         = pipe_writev,
+        .write          = do_sync_write,
+        .aio_write      = pipe_write,
         .poll           = pipe_poll,
         .ioctl          = pipe_ioctl,
         .open           = pipe_write_open,
@@ -797,10 +782,10 @@ static struct file_operations write_pipe_fops = {
 
 static struct file_operations rdwr_pipe_fops = {
         .llseek         = no_llseek,
-        .read           = pipe_read,
-        .readv          = pipe_readv,
-        .write          = pipe_write,
-        .writev         = pipe_writev,
+        .read           = do_sync_read,
+        .aio_read       = pipe_read,
+        .write          = do_sync_write,
+        .aio_write      = pipe_write,
         .poll           = pipe_poll,
         .ioctl          = pipe_ioctl,
         .open           = pipe_rdwr_open,