aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/jbd2/checkpoint.c4
-rw-r--r--fs/jbd2/journal.c2
2 files changed, 0 insertions, 6 deletions
diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
index a572383bcf99..75a15f371b00 100644
--- a/fs/jbd2/checkpoint.c
+++ b/fs/jbd2/checkpoint.c
@@ -625,10 +625,6 @@ int __jbd2_journal_remove_checkpoint(struct journal_head *jh)
625 625
626 __jbd2_journal_drop_transaction(journal, transaction); 626 __jbd2_journal_drop_transaction(journal, transaction);
627 jbd2_journal_free_transaction(transaction); 627 jbd2_journal_free_transaction(transaction);
628
629 /* Just in case anybody was waiting for more transactions to be
630 checkpointed... */
631 wake_up(&journal->j_wait_logspace);
632 ret = 1; 628 ret = 1;
633out: 629out:
634 return ret; 630 return ret;
diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 8e5486d62e89..f43f97ba002e 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -1027,9 +1027,7 @@ static journal_t * journal_init_common (void)
1027 return NULL; 1027 return NULL;
1028 1028
1029 init_waitqueue_head(&journal->j_wait_transaction_locked); 1029 init_waitqueue_head(&journal->j_wait_transaction_locked);
1030 init_waitqueue_head(&journal->j_wait_logspace);
1031 init_waitqueue_head(&journal->j_wait_done_commit); 1030 init_waitqueue_head(&journal->j_wait_done_commit);
1032 init_waitqueue_head(&journal->j_wait_checkpoint);
1033 init_waitqueue_head(&journal->j_wait_commit); 1031 init_waitqueue_head(&journal->j_wait_commit);
1034 init_waitqueue_head(&journal->j_wait_updates); 1032 init_waitqueue_head(&journal->j_wait_updates);
1035 mutex_init(&journal->j_barrier); 1033 mutex_init(&journal->j_barrier);