net: rtnetlink - make create_link take name_assign_type

[linux.git] / fs / jbd / commit.c

diff --git a/fs/jbd/commit.c b/fs/jbd/commit.c
index 11bb11f48b3ad7aa70d80a39af28c65f1f2d2dd1..bb217dcb41affbcca6b42e7c5b018a72e0a3aed0 100644 (file)
--- a/fs/jbd/commit.c
+++ b/fs/jbd/commit.c
@@ -340,13 +340,13 @@ void journal_commit_transaction(journal_t *journal)
        J_ASSERT(journal->j_committing_transaction == NULL);
 
        commit_transaction = journal->j_running_transaction;
        J_ASSERT(journal->j_committing_transaction == NULL);
 
        commit_transaction = journal->j_running_transaction;

-       J_ASSERT(commit_transaction->t_state == T_RUNNING);

 
        trace_jbd_start_commit(journal, commit_transaction);
        jbd_debug(1, "JBD: starting commit of transaction %d\n",
                        commit_transaction->t_tid);
 
        spin_lock(&journal->j_state_lock);
 
        trace_jbd_start_commit(journal, commit_transaction);
        jbd_debug(1, "JBD: starting commit of transaction %d\n",
                        commit_transaction->t_tid);
 
        spin_lock(&journal->j_state_lock);

+       J_ASSERT(commit_transaction->t_state == T_RUNNING);

        commit_transaction->t_state = T_LOCKED;
 
        trace_jbd_commit_locking(journal, commit_transaction);
        commit_transaction->t_state = T_LOCKED;
 
        trace_jbd_commit_locking(journal, commit_transaction);