1 files changed, 5 insertions, 0 deletions

diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 09d0488e9a15..bdd399bc2abf 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -4720,6 +4720,10 @@ int ext4_change_inode_journal_flag(struct inode *inode, int val)
                         return err;
         }
 
+        /* Wait for all existing dio workers */
+        ext4_inode_block_unlocked_dio(inode);
+        inode_dio_wait(inode);
+
         jbd2_journal_lock_updates(journal);
 
         /*
@@ -4739,6 +4743,7 @@ int ext4_change_inode_journal_flag(struct inode *inode, int val)
         ext4_set_aops(inode);
 
         jbd2_journal_unlock_updates(journal);
+        ext4_inode_resume_unlocked_dio(inode);
 
         /* Finally we can mark the inode as dirty. */