From 12920dddf9dfeceab8571eebdbfaf48c69940a59 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 28 Oct 2008 21:08:20 -0400 Subject: [PATCH] --- yaml --- r: 118226 b: refs/heads/master c: 6c20ec850360bc6e5c66a787f0523a80450d65ab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd2/commit.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a4fd46f97ca4..294b021952eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef2cabf7c6d838eb0ee2b4fb8ef84f7c06ce16d9 +refs/heads/master: 6c20ec850360bc6e5c66a787f0523a80450d65ab diff --git a/trunk/fs/jbd2/commit.c b/trunk/fs/jbd2/commit.c index 8b119e16aa36..ebc667bc54a8 100644 --- a/trunk/fs/jbd2/commit.c +++ b/trunk/fs/jbd2/commit.c @@ -974,6 +974,9 @@ void jbd2_journal_commit_transaction(journal_t *journal) journal->j_committing_transaction = NULL; 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 && commit_transaction->t_checkpoint_io_list == NULL) { __jbd2_journal_drop_transaction(journal, commit_transaction); @@ -995,11 +998,8 @@ void jbd2_journal_commit_transaction(journal_t *journal) } 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", - journal->j_devname, commit_transaction->t_tid, + journal->j_devname, journal->j_commit_sequence, journal->j_tail_sequence); jbd_debug(1, "JBD: commit %d complete, head %d\n", journal->j_commit_sequence, journal->j_tail_sequence);