2 files changed, 7 insertions, 7 deletions

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index 8c514367ba5a..b6b194ec1b4f 100644
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -393,7 +393,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
         /* Do we need to erase the effects of a prior jbd2_journal_flush? */
         if (journal->j_flags & JBD2_FLUSHED) {
                 jbd_debug(3, "super block updated\n");
-                mutex_lock(&journal->j_checkpoint_mutex);
+                mutex_lock_io(&journal->j_checkpoint_mutex);
                 /*
                  * We hold j_checkpoint_mutex so tail cannot change under us.
                  * We don't need any special data guarantees for writing sb
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index a097048ed1a3..d8a5d0a08f07 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -944,7 +944,7 @@ out:
  */
 void jbd2_update_log_tail(journal_t *journal, tid_t tid, unsigned long block)
 {
-        mutex_lock(&journal->j_checkpoint_mutex);
+        mutex_lock_io(&journal->j_checkpoint_mutex);
         if (tid_gt(tid, journal->j_tail_sequence))
                 __jbd2_update_log_tail(journal, tid, block);
         mutex_unlock(&journal->j_checkpoint_mutex);
@@ -1304,7 +1304,7 @@ static int journal_reset(journal_t *journal)
                 journal->j_flags |= JBD2_FLUSHED;
         } else {
                 /* Lock here to make assertions happy... */
-                mutex_lock(&journal->j_checkpoint_mutex);
+                mutex_lock_io(&journal->j_checkpoint_mutex);
                 /*
                  * Update log tail information. We use REQ_FUA since new
                  * transaction will start reusing journal space and so we
@@ -1691,7 +1691,7 @@ int jbd2_journal_destroy(journal_t *journal)
         spin_lock(&journal->j_list_lock);
         while (journal->j_checkpoint_transactions != NULL) {
                 spin_unlock(&journal->j_list_lock);
-                mutex_lock(&journal->j_checkpoint_mutex);
+                mutex_lock_io(&journal->j_checkpoint_mutex);
                 err = jbd2_log_do_checkpoint(journal);
                 mutex_unlock(&journal->j_checkpoint_mutex);
                 /*
@@ -1713,7 +1713,7 @@ int jbd2_journal_destroy(journal_t *journal)
 
         if (journal->j_sb_buffer) {
                 if (!is_journal_aborted(journal)) {
-                        mutex_lock(&journal->j_checkpoint_mutex);
+                        mutex_lock_io(&journal->j_checkpoint_mutex);
 
                         write_lock(&journal->j_state_lock);
                         journal->j_tail_sequence =
@@ -1955,7 +1955,7 @@ int jbd2_journal_flush(journal_t *journal)
         spin_lock(&journal->j_list_lock);
         while (!err && journal->j_checkpoint_transactions != NULL) {
                 spin_unlock(&journal->j_list_lock);
-                mutex_lock(&journal->j_checkpoint_mutex);
+                mutex_lock_io(&journal->j_checkpoint_mutex);
                 err = jbd2_log_do_checkpoint(journal);
                 mutex_unlock(&journal->j_checkpoint_mutex);
                 spin_lock(&journal->j_list_lock);
@@ -1965,7 +1965,7 @@ int jbd2_journal_flush(journal_t *journal)
         if (is_journal_aborted(journal))
                 return -EIO;
 
-        mutex_lock(&journal->j_checkpoint_mutex);
+        mutex_lock_io(&journal->j_checkpoint_mutex);
         if (!err) {
                 err = jbd2_cleanup_journal_tail(journal);
                 if (err < 0) {