xfs: Use iomap_dio_rw to wait for unaligned direct IO

Use iomap_dio_rw() to wait for unaligned direct IO instead of opencoding
the wait.

Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>

diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 0739ba72a82ed21f7cd99eea6f86adaccbc9fed1..c0620135a279d8533f7c088066dbc8997c2e1b3b 100644 (file)
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -547,16 +547,12 @@ xfs_file_dio_aio_write(
        }
 
        trace_xfs_file_direct_write(ip, count, iocb->ki_pos);
        }
 
        trace_xfs_file_direct_write(ip, count, iocb->ki_pos);

-       ret = iomap_dio_rw(iocb, from, &xfs_iomap_ops, &xfs_dio_write_ops,
-                          is_sync_kiocb(iocb));
-

        /*
        /*

-        * If unaligned, this is the only IO in-flight. If it has not yet
-        * completed, wait on it before we release the iolock to prevent
-        * subsequent overlapping IO.
+        * If unaligned, this is the only IO in-flight. Wait on it before we
+        * release the iolock to prevent subsequent overlapping IO.

         */
         */

-       if (ret == -EIOCBQUEUED && unaligned_io)
-               inode_dio_wait(inode);
+       ret = iomap_dio_rw(iocb, from, &xfs_iomap_ops, &xfs_dio_write_ops,
+                          is_sync_kiocb(iocb) || unaligned_io);

 out:
        xfs_iunlock(ip, iolock);
 
 out:
        xfs_iunlock(ip, iolock);