1 files changed, 7 insertions, 0 deletions

diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index 98ec11f69cd4..2c5baa5e8291 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -264,6 +264,13 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         }
 
         ret = __generic_file_write_iter(iocb, from);
+        /*
+         * Unaligned direct AIO must be the only IO in flight. Otherwise
+         * overlapping aligned IO after unaligned might result in data
+         * corruption.
+         */
+        if (ret == -EIOCBQUEUED && unaligned_aio)
+                ext4_unwritten_wait(inode);
         inode_unlock(inode);
 
         if (ret > 0)