diff options
| author | Dmitry Baryshkov <[email protected]> | 2024-06-12 16:51:59 +0300 |
|---|---|---|
| committer | Dmitry Baryshkov <[email protected]> | 2024-06-12 16:52:39 +0300 |
| commit | 92815da4576a495cb6362cdfb132152fccc2222d (patch) | |
| tree | aab359ebf2ab210e9455b1d21d8298ceb81080c0 /fs/jbd2/commit.c | |
| parent | aeacc39e2088a15ee31c8af4f68c84981fa08eb7 (diff) | |
| parent | 6b4468b0c6ba37a16795da567b58dc80bc7fb439 (diff) | |
Merge remote-tracking branch 'drm-misc/drm-misc-next' into HEAD
Merge drm-misc-next tree into the msm-next tree in order to be able to
use HDMI connector framework for the MSM HDMI driver.
Diffstat (limited to 'fs/jbd2/commit.c')
| -rw-r--r-- | fs/jbd2/commit.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 5e122586e06e..75ea4e9a5cab 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c @@ -501,7 +501,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) * frees some memory */ spin_lock(&journal->j_list_lock); - __jbd2_journal_clean_checkpoint_list(journal, false); + __jbd2_journal_clean_checkpoint_list(journal, JBD2_SHRINK_BUSY_STOP); spin_unlock(&journal->j_list_lock); jbd2_debug(3, "JBD2: commit phase 1\n"); @@ -571,7 +571,6 @@ void jbd2_journal_commit_transaction(journal_t *journal) J_ASSERT(commit_transaction->t_nr_buffers <= atomic_read(&commit_transaction->t_outstanding_credits)); - err = 0; bufs = 0; descriptor = NULL; while (commit_transaction->t_buffers) { |