3 files changed, 10 insertions, 2 deletions

diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h
index 6481e3ca3528..37e7d8b66c99 100644
--- a/fs/ext4/ext4.h
+++ b/fs/ext4/ext4.h
@@ -185,6 +185,7 @@ struct mpage_da_data {
 #define EXT4_IO_END_ERROR       0x0002
 #define EXT4_IO_END_QUEUED      0x0004
 #define EXT4_IO_END_DIRECT      0x0008
+#define EXT4_IO_END_IN_FSYNC    0x0010
 
 struct ext4_io_page {
         struct page     *p_page;
diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index 00a2cb753efd..bb6c7d811313 100644
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -89,6 +89,7 @@ int ext4_flush_completed_IO(struct inode *inode)
                 io = list_entry(ei->i_completed_io_list.next,
                                 ext4_io_end_t, list);
                 list_del_init(&io->list);
+                io->flag |= EXT4_IO_END_IN_FSYNC;
                 /*
                  * Calling ext4_end_io_nolock() to convert completed
                  * IO to written.
@@ -108,6 +109,7 @@ int ext4_flush_completed_IO(struct inode *inode)
                 if (ret < 0)
                         ret2 = ret;
                 spin_lock_irqsave(&ei->i_completed_io_lock, flags);
+                io->flag &= ~EXT4_IO_END_IN_FSYNC;
         }
         spin_unlock_irqrestore(&ei->i_completed_io_lock, flags);
         return (ret2 < 0) ? ret2 : 0;
diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c
index 9e1b8eb1e7ac..dcdeef169a69 100644
--- a/fs/ext4/page-io.c
+++ b/fs/ext4/page-io.c
@@ -129,12 +129,18 @@ static void ext4_end_io_work(struct work_struct *work)
         unsigned long           flags;
 
         spin_lock_irqsave(&ei->i_completed_io_lock, flags);
+        if (io->flag & EXT4_IO_END_IN_FSYNC)
+                goto requeue;
         if (list_empty(&io->list)) {
                 spin_unlock_irqrestore(&ei->i_completed_io_lock, flags);
                 goto free;
         }
 
         if (!mutex_trylock(&inode->i_mutex)) {
+                bool was_queued;
+requeue:
+                was_queued = !!(io->flag & EXT4_IO_END_QUEUED);
+                io->flag |= EXT4_IO_END_QUEUED;
                 spin_unlock_irqrestore(&ei->i_completed_io_lock, flags);
                 /*
                  * Requeue the work instead of waiting so that the work
@@ -147,9 +153,8 @@ static void ext4_end_io_work(struct work_struct *work)
                  * yield the cpu if it sees an end_io request that has already
                  * been requeued.
                  */
-                if (io->flag & EXT4_IO_END_QUEUED)
+                if (was_queued)
                         yield();
-                io->flag |= EXT4_IO_END_QUEUED;
                 return;
         }
         list_del_init(&io->list);