3 files changed, 33 insertions, 4 deletions

diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index 3278e64e57b6..e0ba8a408def 100644
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -166,8 +166,7 @@ int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
         if (journal->j_flags & JBD2_BARRIER &&
             !jbd2_trans_will_send_data_barrier(journal, commit_tid))
                 needs_barrier = true;
-        jbd2_log_start_commit(journal, commit_tid);
-        ret = jbd2_log_wait_commit(journal, commit_tid);
+        ret = jbd2_complete_transaction(journal, commit_tid);
         if (needs_barrier) {
                 err = blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
                 if (!ret)
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c
index 22c5c67ab4d1..0dbc84a13385 100644
--- a/fs/ext4/inode.c
+++ b/fs/ext4/inode.c
@@ -216,8 +216,7 @@ void ext4_evict_inode(struct inode *inode)
                         journal_t *journal = EXT4_SB(inode->i_sb)->s_journal;
                         tid_t commit_tid = EXT4_I(inode)->i_datasync_tid;
 
-                        jbd2_log_start_commit(journal, commit_tid);
-                        jbd2_log_wait_commit(journal, commit_tid);
+                        jbd2_complete_transaction(journal, commit_tid);
                         filemap_write_and_wait(&inode->i_data);
                 }
                 truncate_inode_pages(&inode->i_data, 0);
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index dbf41f9452db..42f8cf6cd5da 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -698,6 +698,37 @@ int jbd2_log_wait_commit(journal_t *journal, tid_t tid)
 }
 
 /*
+ * When this function returns the transaction corresponding to tid
+ * will be completed.  If the transaction has currently running, start
+ * committing that transaction before waiting for it to complete.  If
+ * the transaction id is stale, it is by definition already completed,
+ * so just return SUCCESS.
+ */
+int jbd2_complete_transaction(journal_t *journal, tid_t tid)
+{
+        int     need_to_wait = 1;
+
+        read_lock(&journal->j_state_lock);
+        if (journal->j_running_transaction &&
+            journal->j_running_transaction->t_tid == tid) {
+                if (journal->j_commit_request != tid) {
+                        /* transaction not yet started, so request it */
+                        read_unlock(&journal->j_state_lock);
+                        jbd2_log_start_commit(journal, tid);
+                        goto wait_commit;
+                }
+        } else if (!(journal->j_committing_transaction &&
+                     journal->j_committing_transaction->t_tid == tid))
+                need_to_wait = 0;
+        read_unlock(&journal->j_state_lock);
+        if (!need_to_wait)
+                return 0;
+wait_commit:
+        return jbd2_log_wait_commit(journal, tid);
+}
+EXPORT_SYMBOL(jbd2_complete_transaction);
+
+/*
  * Log buffer allocation routines:
  */