Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

[linux-2.6-microblaze.git] / fs / iomap / direct-io.c

diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index 2273120..e2c4991 100644 (file)
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -279,11 +279,8 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
        orig_count = iov_iter_count(dio->submit.iter);
        iov_iter_truncate(dio->submit.iter, length);
 
-       nr_pages = iov_iter_npages(dio->submit.iter, BIO_MAX_PAGES);
-       if (nr_pages <= 0) {
-               ret = nr_pages;
+       if (!iov_iter_count(dio->submit.iter))
                goto out;
-       }
 
        if (need_zeroout) {
                /* zero out from the start of the block to the write offset */
@@ -299,6 +296,7 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
         */
        bio_opf = iomap_dio_bio_opflags(dio, iomap, use_fua);
 
+       nr_pages = bio_iov_vecs_to_alloc(dio->submit.iter, BIO_MAX_PAGES);
        do {
                size_t n;
                if (dio->error) {
@@ -339,7 +337,8 @@ iomap_dio_bio_actor(struct inode *inode, loff_t pos, loff_t length,
                dio->size += n;
                copied += n;
 
-               nr_pages = iov_iter_npages(dio->submit.iter, BIO_MAX_PAGES);
+               nr_pages = bio_iov_vecs_to_alloc(dio->submit.iter,
+                                                BIO_MAX_PAGES);
                iomap_dio_submit_bio(dio, iomap, bio, pos);
                pos += n;
        } while (nr_pages);
@@ -451,23 +450,22 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length,
 struct iomap_dio *
 __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
                const struct iomap_ops *ops, const struct iomap_dio_ops *dops,
-               bool wait_for_completion)
+               unsigned int dio_flags)
 {
        struct address_space *mapping = iocb->ki_filp->f_mapping;
        struct inode *inode = file_inode(iocb->ki_filp);
        size_t count = iov_iter_count(iter);
        loff_t pos = iocb->ki_pos;
        loff_t end = iocb->ki_pos + count - 1, ret = 0;
-       unsigned int flags = IOMAP_DIRECT;
+       bool wait_for_completion =
+               is_sync_kiocb(iocb) || (dio_flags & IOMAP_DIO_FORCE_WAIT);
+       unsigned int iomap_flags = IOMAP_DIRECT;
        struct blk_plug plug;
        struct iomap_dio *dio;
 
        if (!count)
                return NULL;
 
-       if (WARN_ON(is_sync_kiocb(iocb) && !wait_for_completion))
-               return ERR_PTR(-EIO);
-
        dio = kmalloc(sizeof(*dio), GFP_KERNEL);
        if (!dio)
                return ERR_PTR(-ENOMEM);
@@ -492,7 +490,7 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
                if (iter_is_iovec(iter))
                        dio->flags |= IOMAP_DIO_DIRTY;
        } else {
-               flags |= IOMAP_WRITE;
+               iomap_flags |= IOMAP_WRITE;
                dio->flags |= IOMAP_DIO_WRITE;
 
                /* for data sync or sync, we need sync completion processing */
@@ -514,7 +512,14 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
                        ret = -EAGAIN;
                        goto out_free_dio;
                }
-               flags |= IOMAP_NOWAIT;
+               iomap_flags |= IOMAP_NOWAIT;
+       }
+
+       if (dio_flags & IOMAP_DIO_OVERWRITE_ONLY) {
+               ret = -EAGAIN;
+               if (pos >= dio->i_size || pos + count > dio->i_size)
+                       goto out_free_dio;
+               iomap_flags |= IOMAP_OVERWRITE_ONLY;
        }
 
        ret = filemap_write_and_wait_range(mapping, pos, end);
@@ -545,7 +550,7 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
 
        blk_start_plug(&plug);
        do {
-               ret = iomap_apply(inode, pos, count, flags, ops, dio,
+               ret = iomap_apply(inode, pos, count, iomap_flags, ops, dio,
                                iomap_dio_actor);
                if (ret <= 0) {
                        /* magic error code to fall back to buffered I/O */
@@ -629,11 +634,11 @@ EXPORT_SYMBOL_GPL(__iomap_dio_rw);
 ssize_t
 iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,
                const struct iomap_ops *ops, const struct iomap_dio_ops *dops,
-               bool wait_for_completion)
+               unsigned int dio_flags)
 {
        struct iomap_dio *dio;
 
-       dio = __iomap_dio_rw(iocb, iter, ops, dops, wait_for_completion);
+       dio = __iomap_dio_rw(iocb, iter, ops, dops, dio_flags);
        if (IS_ERR_OR_NULL(dio))
                return PTR_ERR_OR_ZERO(dio);
        return iomap_dio_complete(dio);