Merge tag 'mm-stable-2022-10-08' of git://git.kernel.org/pub/scm/linux/kernel/git...

[J-linux.git] / fs / jbd2 / commit.c

diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c
index b2b2bc9b88d9d1fbe825d045c2161024db3ca8fc..885a7a6cc53e6df5315adfa6419a11e0c4ce536f 100644 (file)
--- a/fs/jbd2/commit.c
+++ b/fs/jbd2/commit.c
@@ -122,8 +122,8 @@ static int journal_submit_commit_record(journal_t *journal,
 {
        struct commit_header *tmp;
        struct buffer_head *bh;
-       int ret;
        struct timespec64 now;
+       blk_opf_t write_flags = REQ_OP_WRITE | REQ_SYNC;
 
        *cbh = NULL;
 
@@ -155,13 +155,11 @@ static int journal_submit_commit_record(journal_t *journal,
 
        if (journal->j_flags & JBD2_BARRIER &&
            !jbd2_has_feature_async_commit(journal))
-               ret = submit_bh(REQ_OP_WRITE | REQ_SYNC | REQ_PREFLUSH |
-                               REQ_FUA, bh);
-       else
-               ret = submit_bh(REQ_OP_WRITE | REQ_SYNC, bh);
+               write_flags |= REQ_PREFLUSH | REQ_FUA;
 
+       submit_bh(write_flags, bh);
        *cbh = bh;
-       return ret;
+       return 0;
 }
 
 /*
@@ -570,7 +568,7 @@ void jbd2_journal_commit_transaction(journal_t *journal)
        journal->j_running_transaction = NULL;
        start_time = ktime_get();
        commit_transaction->t_log_start = journal->j_head;
-       wake_up(&journal->j_wait_transaction_locked);
+       wake_up_all(&journal->j_wait_transaction_locked);
        write_unlock(&journal->j_state_lock);
 
        jbd2_debug(3, "JBD2: commit phase 2a\n");