remove lock_journal calls from checkpoint.c fs/jbd/checkpoint.c | 5 ----- 1 files changed, 5 deletions(-) diff -puN fs/jbd/checkpoint.c~jbd-400-remove-lock_journal-checkpoint_c fs/jbd/checkpoint.c --- 25/fs/jbd/checkpoint.c~jbd-400-remove-lock_journal-checkpoint_c 2003-05-24 21:07:22.000000000 -0700 +++ 25-akpm/fs/jbd/checkpoint.c 2003-05-24 21:07:53.000000000 -0700 @@ -83,10 +83,8 @@ void __log_wait_for_space(journal_t *jou while (__log_space_left(journal) < nblocks) { if (journal->j_flags & JFS_ABORT) return; - unlock_journal(journal); spin_unlock(&journal->j_state_lock); down(&journal->j_checkpoint_sem); - lock_journal(journal); /* * Test again, another process may have checkpointed while we @@ -134,7 +132,6 @@ static int __cleanup_transaction(journal if (buffer_locked(bh)) { atomic_inc(&bh->b_count); spin_unlock(&journal->j_list_lock); - unlock_journal(journal); wait_on_buffer(bh); /* the journal_head may have gone by now */ BUFFER_TRACE(bh, "brelse"); @@ -150,7 +147,6 @@ static int __cleanup_transaction(journal jbd_unlock_bh_state(bh); spin_unlock(&journal->j_list_lock); log_start_commit(journal, transaction); - unlock_journal(journal); log_wait_commit(journal, tid); goto out_return_1; } @@ -180,7 +176,6 @@ static int __cleanup_transaction(journal return ret; out_return_1: - lock_journal(journal); spin_lock(&journal->j_list_lock); return 1; } _