1 files changed, 3 insertions, 2 deletions

diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index a0e41a4c080e..35ae096bed5d 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -517,12 +517,13 @@ void jbd2_journal_lock_updates(journal_t *journal)
                         break;
 
                 spin_lock(&transaction->t_handle_lock);
+                prepare_to_wait(&journal->j_wait_updates, &wait,
+                                TASK_UNINTERRUPTIBLE);
                 if (!atomic_read(&transaction->t_updates)) {
                         spin_unlock(&transaction->t_handle_lock);
+                        finish_wait(&journal->j_wait_updates, &wait);
                         break;
                 }
-                prepare_to_wait(&journal->j_wait_updates, &wait,
-                                TASK_UNINTERRUPTIBLE);
                 spin_unlock(&transaction->t_handle_lock);
                 write_unlock(&journal->j_state_lock);
                 schedule();