1 files changed, 10 insertions, 27 deletions

diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c
index 4fc557c40cc0..66571eafbb1e 100644
--- a/fs/fuse/dev.c
+++ b/fs/fuse/dev.c
@@ -680,14 +680,15 @@ static int fuse_read_interrupt(struct fuse_conn *fc, struct fuse_req *req,
  * request_end().  Otherwise add it to the processing list, and set
  * the 'sent' flag.
  */
-static ssize_t fuse_dev_readv(struct file *file, const struct iovec *iov,
-                              unsigned long nr_segs, loff_t *off)
+static ssize_t fuse_dev_read(struct kiocb *iocb, const struct iovec *iov,
+                              unsigned long nr_segs, loff_t pos)
 {
         int err;
         struct fuse_req *req;
         struct fuse_in *in;
         struct fuse_copy_state cs;
         unsigned reqsize;
+        struct file *file = iocb->ki_filp;
         struct fuse_conn *fc = fuse_get_conn(file);
         if (!fc)
                 return -EPERM;
@@ -761,15 +762,6 @@ static ssize_t fuse_dev_readv(struct file *file, const struct iovec *iov,
         return err;
 }
 
-static ssize_t fuse_dev_read(struct file *file, char __user *buf,
-                             size_t nbytes, loff_t *off)
-{
-        struct iovec iov;
-        iov.iov_len = nbytes;
-        iov.iov_base = buf;
-        return fuse_dev_readv(file, &iov, 1, off);
-}
-
 /* Look up request on processing list by unique ID */
 static struct fuse_req *request_find(struct fuse_conn *fc, u64 unique)
 {
@@ -814,15 +806,15 @@ static int copy_out_args(struct fuse_copy_state *cs, struct fuse_out *out,
  * it from the list and copy the rest of the buffer to the request.
  * The request is finished by calling request_end()
  */
-static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov,
-                               unsigned long nr_segs, loff_t *off)
+static ssize_t fuse_dev_write(struct kiocb *iocb, const struct iovec *iov,
+                               unsigned long nr_segs, loff_t pos)
 {
         int err;
         unsigned nbytes = iov_length(iov, nr_segs);
         struct fuse_req *req;
         struct fuse_out_header oh;
         struct fuse_copy_state cs;
-        struct fuse_conn *fc = fuse_get_conn(file);
+        struct fuse_conn *fc = fuse_get_conn(iocb->ki_filp);
         if (!fc)
                 return -EPERM;
 
@@ -898,15 +890,6 @@ static ssize_t fuse_dev_writev(struct file *file, const struct iovec *iov,
         return err;
 }
 
-static ssize_t fuse_dev_write(struct file *file, const char __user *buf,
-                              size_t nbytes, loff_t *off)
-{
-        struct iovec iov;
-        iov.iov_len = nbytes;
-        iov.iov_base = (char __user *) buf;
-        return fuse_dev_writev(file, &iov, 1, off);
-}
-
 static unsigned fuse_dev_poll(struct file *file, poll_table *wait)
 {
         unsigned mask = POLLOUT | POLLWRNORM;
@@ -1041,10 +1024,10 @@ static int fuse_dev_fasync(int fd, struct file *file, int on)
 const struct file_operations fuse_dev_operations = {
         .owner          = THIS_MODULE,
         .llseek         = no_llseek,
-        .read           = fuse_dev_read,
-        .readv          = fuse_dev_readv,
-        .write          = fuse_dev_write,
-        .writev         = fuse_dev_writev,
+        .read           = do_sync_read,
+        .aio_read       = fuse_dev_read,
+        .write          = do_sync_write,
+        .aio_write      = fuse_dev_write,
         .poll           = fuse_dev_poll,
         .release        = fuse_dev_release,
         .fasync         = fuse_dev_fasync,