|
@@ -974,6 +974,9 @@ restart_loop:
|
|
journal->j_committing_transaction = NULL;
|
|
journal->j_committing_transaction = NULL;
|
|
spin_unlock(&journal->j_state_lock);
|
|
spin_unlock(&journal->j_state_lock);
|
|
|
|
|
|
|
|
+ if (journal->j_commit_callback)
|
|
|
|
+ journal->j_commit_callback(journal, commit_transaction);
|
|
|
|
+
|
|
if (commit_transaction->t_checkpoint_list == NULL &&
|
|
if (commit_transaction->t_checkpoint_list == NULL &&
|
|
commit_transaction->t_checkpoint_io_list == NULL) {
|
|
commit_transaction->t_checkpoint_io_list == NULL) {
|
|
__jbd2_journal_drop_transaction(journal, commit_transaction);
|
|
__jbd2_journal_drop_transaction(journal, commit_transaction);
|
|
@@ -995,11 +998,8 @@ restart_loop:
|
|
}
|
|
}
|
|
spin_unlock(&journal->j_list_lock);
|
|
spin_unlock(&journal->j_list_lock);
|
|
|
|
|
|
- if (journal->j_commit_callback)
|
|
|
|
- journal->j_commit_callback(journal, commit_transaction);
|
|
|
|
-
|
|
|
|
trace_mark(jbd2_end_commit, "dev %s transaction %d head %d",
|
|
trace_mark(jbd2_end_commit, "dev %s transaction %d head %d",
|
|
- journal->j_devname, commit_transaction->t_tid,
|
|
|
|
|
|
+ journal->j_devname, journal->j_commit_sequence,
|
|
journal->j_tail_sequence);
|
|
journal->j_tail_sequence);
|
|
jbd_debug(1, "JBD: commit %d complete, head %d\n",
|
|
jbd_debug(1, "JBD: commit %d complete, head %d\n",
|
|
journal->j_commit_sequence, journal->j_tail_sequence);
|
|
journal->j_commit_sequence, journal->j_tail_sequence);
|