| Date | Mon, 29 May 2006 23:27:37 +0200 | From | Ingo Molnar <> | Subject | [patch 56/61] lock validator: special locking: jbd |
| |
From: Ingo Molnar <mingo@elte.hu>
teach special (non-nested) unlocking code to the lock validator. Has no effect on non-lockdep kernels.
Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> --- fs/jbd/checkpoint.c | 2 +- fs/jbd/commit.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
Index: linux/fs/jbd/checkpoint.c =================================================================== --- linux.orig/fs/jbd/checkpoint.c +++ linux/fs/jbd/checkpoint.c @@ -135,7 +135,7 @@ void __log_wait_for_space(journal_t *jou log_do_checkpoint(journal); spin_lock(&journal->j_state_lock); } - mutex_unlock(&journal->j_checkpoint_mutex); + mutex_unlock_non_nested(&journal->j_checkpoint_mutex); } } Index: linux/fs/jbd/commit.c =================================================================== --- linux.orig/fs/jbd/commit.c +++ linux/fs/jbd/commit.c @@ -838,7 +838,7 @@ restart_loop: J_ASSERT(commit_transaction == journal->j_committing_transaction); journal->j_commit_sequence = commit_transaction->t_tid; journal->j_committing_transaction = NULL; - spin_unlock(&journal->j_state_lock); + spin_unlock_non_nested(&journal->j_state_lock); if (commit_transaction->t_checkpoint_list == NULL) { __journal_drop_transaction(journal, commit_transaction); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
|