Remove rw from dax_{do_,}io()

And use iov_iter_rw() instead.

Signed-off-by: Omar Sandoval <osandov@osandov.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/fs/dax.c b/fs/dax.c
index ed1619ec6537c25707ea801e772571f3c2fcaf5d..a27846946525ed48b87071743f21ae744dacac36 100644 (file)
--- a/fs/dax.c
+++ b/fs/dax.c
@@ -98,9 +98,9 @@ static bool buffer_size_valid(struct buffer_head *bh)
        return bh->b_state != 0;
 }
 
-static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
-                       loff_t start, loff_t end, get_block_t get_block,
-                       struct buffer_head *bh)
+static ssize_t dax_io(struct inode *inode, struct iov_iter *iter,
+                     loff_t start, loff_t end, get_block_t get_block,
+                     struct buffer_head *bh)
 {
        ssize_t retval = 0;
        loff_t pos = start;
@@ -109,7 +109,7 @@ static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
        void *addr;
        bool hole = false;
 
-       if (rw != WRITE)
+       if (iov_iter_rw(iter) != WRITE)
                end = min(end, i_size_read(inode));
 
        while (pos < end) {
@@ -124,7 +124,7 @@ static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
                                bh->b_size = PAGE_ALIGN(end - pos);
                                bh->b_state = 0;
                                retval = get_block(inode, block, bh,
-                                                               rw == WRITE);
+                                                  iov_iter_rw(iter) == WRITE);
                                if (retval)
                                        break;
                                if (!buffer_size_valid(bh))
@@ -137,7 +137,7 @@ static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
                                bh->b_size -= done;
                        }
 
-                       hole = (rw != WRITE) && !buffer_written(bh);
+                       hole = iov_iter_rw(iter) != WRITE && !buffer_written(bh);
                        if (hole) {
                                addr = NULL;
                                size = bh->b_size - first;
@@ -154,7 +154,7 @@ static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
                        max = min(pos + size, end);
                }
 
-               if (rw == WRITE)
+               if (iov_iter_rw(iter) == WRITE)
                        len = copy_from_iter(addr, max - pos, iter);
                else if (!hole)
                        len = copy_to_iter(addr, max - pos, iter);
@@ -173,7 +173,6 @@ static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
 
 /**
  * dax_do_io - Perform I/O to a DAX file
- * @rw: READ to read or WRITE to write
  * @iocb: The control block for this I/O
  * @inode: The file which the I/O is directed at
  * @iter: The addresses to do I/O from or to
@@ -189,9 +188,9 @@ static ssize_t dax_io(int rw, struct inode *inode, struct iov_iter *iter,
  * As with do_blockdev_direct_IO(), we increment i_dio_count while the I/O
  * is in progress.
  */
-ssize_t dax_do_io(int rw, struct kiocb *iocb, struct inode *inode,
-                       struct iov_iter *iter, loff_t pos,
-                       get_block_t get_block, dio_iodone_t end_io, int flags)
+ssize_t dax_do_io(struct kiocb *iocb, struct inode *inode,
+                 struct iov_iter *iter, loff_t pos, get_block_t get_block,
+                 dio_iodone_t end_io, int flags)
 {
        struct buffer_head bh;
        ssize_t retval = -EINVAL;
@@ -199,7 +198,7 @@ ssize_t dax_do_io(int rw, struct kiocb *iocb, struct inode *inode,
 
        memset(&bh, 0, sizeof(bh));
 
-       if ((flags & DIO_LOCKING) && (rw == READ)) {
+       if ((flags & DIO_LOCKING) && iov_iter_rw(iter) == READ) {
                struct address_space *mapping = inode->i_mapping;
                mutex_lock(&inode->i_mutex);
                retval = filemap_write_and_wait_range(mapping, pos, end - 1);
@@ -212,9 +211,9 @@ ssize_t dax_do_io(int rw, struct kiocb *iocb, struct inode *inode,
        /* Protects against truncate */
        atomic_inc(&inode->i_dio_count);
 
-       retval = dax_io(rw, inode, iter, pos, end, get_block, &bh);
+       retval = dax_io(inode, iter, pos, end, get_block, &bh);
 
-       if ((flags & DIO_LOCKING) && (rw == READ))
+       if ((flags & DIO_LOCKING) && iov_iter_rw(iter) == READ)
                mutex_unlock(&inode->i_mutex);
 
        if ((retval > 0) && end_io)

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index 3cbeb1b63acf8ea15e4aa8e9080bea71b1cd1691..14e8d1752685a29f20229e2e93def9eccf526abc 100644 (file)
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -861,8 +861,8 @@ ext2_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter,
        ssize_t ret;
 
        if (IS_DAX(inode))
-               ret = dax_do_io(rw, iocb, inode, iter, offset, ext2_get_block,
-                               NULL, DIO_LOCKING);
+               ret = dax_do_io(iocb, inode, iter, offset, ext2_get_block, NULL,
+                               DIO_LOCKING);
        else
                ret = blockdev_direct_IO(iocb, inode, iter, offset,
                                         ext2_get_block);

diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c
index ae4ffc27abc66d5a78a6e5698be748899ff18259..cd81d01da0b0b6b93a3dd7c16ad4d813a7741fc0 100644 (file)
--- a/fs/ext4/indirect.c
+++ b/fs/ext4/indirect.c
@@ -690,7 +690,7 @@ retry:
                        goto locked;
                }
                if (IS_DAX(inode))
-                       ret = dax_do_io(rw, iocb, inode, iter, offset,
+                       ret = dax_do_io(iocb, inode, iter, offset,
                                        ext4_get_block, NULL, 0);
                else
                        ret = __blockdev_direct_IO(iocb, inode,
@@ -701,7 +701,7 @@ retry:
        } else {
 locked:
                if (IS_DAX(inode))
-                       ret = dax_do_io(rw, iocb, inode, iter, offset,
+                       ret = dax_do_io(iocb, inode, iter, offset,
                                        ext4_get_block, NULL, DIO_LOCKING);
                else
                        ret = blockdev_direct_IO(iocb, inode, iter, offset,

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index ec049c04b197f42ca1597fa362a81c0cbc67e46d..76b8cba5d041c874f8b739fac18f8568d7079d41 100644 (file)
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -3034,7 +3034,7 @@ static ssize_t ext4_ext_direct_IO(int rw, struct kiocb *iocb,
                dio_flags = DIO_LOCKING;
        }
        if (IS_DAX(inode))
-               ret = dax_do_io(rw, iocb, inode, iter, offset, get_block_func,
+               ret = dax_do_io(iocb, inode, iter, offset, get_block_func,
                                ext4_end_io_dio, dio_flags);
        else
                ret = __blockdev_direct_IO(iocb, inode,

diff --git a/include/linux/fs.h b/include/linux/fs.h
index c67b6de8be331e534d20485df982c9115abe0411..295bc589fe1b9dc9531bd1f12ea8463864971986 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2609,8 +2609,8 @@ extern loff_t fixed_size_llseek(struct file *file, loff_t offset,
 extern int generic_file_open(struct inode * inode, struct file * filp);
 extern int nonseekable_open(struct inode * inode, struct file * filp);
 
-ssize_t dax_do_io(int rw, struct kiocb *, struct inode *, struct iov_iter *,
-               loff_t, get_block_t, dio_iodone_t, int flags);
+ssize_t dax_do_io(struct kiocb *, struct inode *, struct iov_iter *, loff_t,
+                 get_block_t, dio_iodone_t, int flags);
 int dax_clear_blocks(struct inode *, sector_t block, long size);
 int dax_zero_page_range(struct inode *, loff_t from, unsigned len, get_block_t);
 int dax_truncate_page(struct inode *, loff_t from, get_block_t);