1 files changed, 7 insertions, 3 deletions

diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index f2b9a571f4cf..9d31e6a39205 100644
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -298,6 +298,7 @@ void journal_commit_transaction(journal_t *journal)
         int tag_flag;
         int i;
         struct blk_plug plug;
+        int write_op = WRITE;
 
         /*
          * First job: lock down the current transaction and wait for
@@ -413,13 +414,16 @@ void journal_commit_transaction(journal_t *journal)
 
         jbd_debug (3, "JBD: commit phase 2\n");
 
+        if (tid_geq(journal->j_commit_waited, commit_transaction->t_tid))
+                write_op = WRITE_SYNC;
+
         /*
          * Now start flushing things to disk, in the order they appear
          * on the transaction lists.  Data blocks go first.
          */
         blk_start_plug(&plug);
         err = journal_submit_data_buffers(journal, commit_transaction,
-                                          WRITE_SYNC);
+                                          write_op);
         blk_finish_plug(&plug);
 
         /*
@@ -478,7 +482,7 @@ void journal_commit_transaction(journal_t *journal)
 
         blk_start_plug(&plug);
 
-        journal_write_revoke_records(journal, commit_transaction, WRITE_SYNC);
+        journal_write_revoke_records(journal, commit_transaction, write_op);
 
         /*
          * If we found any dirty or locked buffers, then we should have
@@ -649,7 +653,7 @@ start_journal_io:
                                 clear_buffer_dirty(bh);
                                 set_buffer_uptodate(bh);
                                 bh->b_end_io = journal_end_buffer_io_sync;
-                                submit_bh(WRITE_SYNC, bh);
+                                submit_bh(write_op, bh);
                         }
                         cond_resched();