Merge remote-tracking branch 'xfs-async-aio-extend' into for-next

4 files changed, 20 insertions, 14 deletions

diff --git a/fs/direct-io.c b/fs/direct-io.c
index 160a5489a939..a701752dd750 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -1194,13 +1194,19 @@ do_blockdev_direct_IO(int rw, struct kiocb *iocb, struct inode *inode,
         }
 
         /*
-         * For file extending writes updating i_size before data
-         * writeouts complete can expose uninitialized blocks. So
-         * even for AIO, we need to wait for i/o to complete before
-         * returning in this case.
+         * For file extending writes updating i_size before data writeouts
+         * complete can expose uninitialized blocks in dumb filesystems.
+         * In that case we need to wait for I/O completion even if asked
+         * for an asynchronous write.
          */
-        dio->is_async = !is_sync_kiocb(iocb) && !((rw & WRITE) &&
-                (end > i_size_read(inode)));
+        if (is_sync_kiocb(iocb))
+                dio->is_async = false;
+        else if (!(dio->flags & DIO_ASYNC_EXTEND) &&
+            (rw & WRITE) && end > i_size_read(inode))
+                dio->is_async = false;
+        else
+                dio->is_async = true;
+
         dio->inode = inode;
         dio->rw = rw;
 
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c
index db2cfb067d0b..ef62c6b6130a 100644
--- a/fs/xfs/xfs_aops.c
+++ b/fs/xfs/xfs_aops.c
@@ -1441,7 +1441,8 @@ xfs_vm_direct_IO(
                 ret = __blockdev_direct_IO(rw, iocb, inode, bdev, iov,
                                             offset, nr_segs,
                                             xfs_get_blocks_direct,
-                                            xfs_end_io_direct_write, NULL, 0);
+                                            xfs_end_io_direct_write, NULL,
+                                            DIO_ASYNC_EXTEND);
                 if (ret != -EIOCBQUEUED && iocb->private)
                         goto out_destroy_ioend;
         } else {
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c
index 22d1cbea283d..3b80ebae05f5 100644
--- a/fs/xfs/xfs_iomap.c
+++ b/fs/xfs/xfs_iomap.c
@@ -128,7 +128,6 @@ xfs_iomap_write_direct(
         xfs_fsblock_t   firstfsb;
         xfs_extlen_t    extsz, temp;
         int             nimaps;
-        int             bmapi_flag;
         int             quota_flag;
         int             rt;
         xfs_trans_t     *tp;
@@ -200,18 +199,15 @@ xfs_iomap_write_direct(
 
         xfs_trans_ijoin(tp, ip, 0);
 
-        bmapi_flag = 0;
-        if (offset < XFS_ISIZE(ip) || extsz)
-                bmapi_flag |= XFS_BMAPI_PREALLOC;
-
         /*
          * From this point onwards we overwrite the imap pointer that the
          * caller gave to us.
          */
         xfs_bmap_init(&free_list, &firstfsb);
         nimaps = 1;
-        error = xfs_bmapi_write(tp, ip, offset_fsb, count_fsb, bmapi_flag,
-                                &firstfsb, 0, imap, &nimaps, &free_list);
+        error = xfs_bmapi_write(tp, ip, offset_fsb, count_fsb,
+                                XFS_BMAPI_PREALLOC, &firstfsb, 0,
+                                imap, &nimaps, &free_list);
         if (error)
                 goto out_bmap_cancel;
 
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 09f553c59813..f7faefcf4843 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2527,6 +2527,9 @@ enum {
 
         /* filesystem does not support filling holes */
         DIO_SKIP_HOLES  = 0x02,
+
+        /* filesystem can handle aio writes beyond i_size */
+        DIO_ASYNC_EXTEND = 0x04,
 };
 
 void dio_end_io(struct bio *bio, int error);