1 files changed, 12 insertions, 10 deletions

diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index c78841ee81cf..7f34f4716165 100644
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -120,8 +120,8 @@ void __jbd2_log_wait_for_space(journal_t *journal)
         int nblocks, space_left;
         /* assert_spin_locked(&journal->j_state_lock); */
 
-        nblocks = jbd_space_needed(journal);
-        while (__jbd2_log_space_left(journal) < nblocks) {
+        nblocks = jbd2_space_needed(journal);
+        while (jbd2_log_space_left(journal) < nblocks) {
                 if (journal->j_flags & JBD2_ABORT)
                         return;
                 write_unlock(&journal->j_state_lock);
@@ -140,8 +140,8 @@ void __jbd2_log_wait_for_space(journal_t *journal)
                  */
                 write_lock(&journal->j_state_lock);
                 spin_lock(&journal->j_list_lock);
-                nblocks = jbd_space_needed(journal);
-                space_left = __jbd2_log_space_left(journal);
+                nblocks = jbd2_space_needed(journal);
+                space_left = jbd2_log_space_left(journal);
                 if (space_left < nblocks) {
                         int chkpt = journal->j_checkpoint_transactions != NULL;
                         tid_t tid = 0;
@@ -156,7 +156,15 @@ void __jbd2_log_wait_for_space(journal_t *journal)
                                 /* We were able to recover space; yay! */
                                 ;
                         } else if (tid) {
+                                /*
+                                 * jbd2_journal_commit_transaction() may want
+                                 * to take the checkpoint_mutex if JBD2_FLUSHED
+                                 * is set.  So we need to temporarily drop it.
+                                 */
+                                mutex_unlock(&journal->j_checkpoint_mutex);
                                 jbd2_log_wait_commit(journal, tid);
+                                write_lock(&journal->j_state_lock);
+                                continue;
                         } else {
                                 printk(KERN_ERR "%s: needed %d blocks and "
                                        "only had %d space available\n",
@@ -625,10 +633,6 @@ int __jbd2_journal_remove_checkpoint(struct journal_head *jh)
 
         __jbd2_journal_drop_transaction(journal, transaction);
         jbd2_journal_free_transaction(transaction);
-
-        /* Just in case anybody was waiting for more transactions to be
-           checkpointed... */
-        wake_up(&journal->j_wait_logspace);
         ret = 1;
 out:
         return ret;
@@ -690,9 +694,7 @@ void __jbd2_journal_drop_transaction(journal_t *journal, transaction_t *transact
         J_ASSERT(transaction->t_state == T_FINISHED);
         J_ASSERT(transaction->t_buffers == NULL);
         J_ASSERT(transaction->t_forget == NULL);
-        J_ASSERT(transaction->t_iobuf_list == NULL);
         J_ASSERT(transaction->t_shadow_list == NULL);
-        J_ASSERT(transaction->t_log_list == NULL);
         J_ASSERT(transaction->t_checkpoint_list == NULL);
         J_ASSERT(transaction->t_checkpoint_io_list == NULL);
         J_ASSERT(atomic_read(&transaction->t_updates) == 0);