remove lock_journal() calls from transaction.c
fs/jbd/transaction.c | 47 ++---------------------------------------------
1 files changed, 2 insertions(+), 45 deletions(-)
diff -puN fs/jbd/transaction.c~jbd-430-remove-lock_journal-transaction_c fs/jbd/transaction.c
--- 25/fs/jbd/transaction.c~jbd-430-remove-lock_journal-transaction_c 2003-05-25 17:07:31.000000000 -0700
+++ 25-akpm/fs/jbd/transaction.c 2003-05-25 17:07:31.000000000 -0700
@@ -108,8 +108,6 @@ alloc_transaction:
repeat:
- lock_journal(journal);
-
/*
* We need to hold j_state_lock until t_updates has been incremented,
* for proper journal barrier handling
@@ -118,14 +116,12 @@ repeat:
if (is_journal_aborted(journal) ||
(journal->j_errno != 0 && !(journal->j_flags & JFS_ACK_ERR))) {
spin_unlock(&journal->j_state_lock);
- unlock_journal(journal);
return -EROFS;
}
/* Wait on the journal's transaction barrier if necessary */
if (journal->j_barrier_count) {
spin_unlock(&journal->j_state_lock);
- unlock_journal(journal);
wait_event(journal->j_wait_transaction_locked,
journal->j_barrier_count == 0);
goto repeat;
@@ -135,7 +131,6 @@ repeat_locked:
if (!journal->j_running_transaction) {
if (!new_transaction) {
spin_unlock(&journal->j_state_lock);
- unlock_journal(journal);
goto alloc_transaction;
}
get_transaction(journal, new_transaction);
@@ -152,7 +147,6 @@ repeat_locked:
*/
if (transaction->t_state == T_LOCKED) {
spin_unlock(&journal->j_state_lock);
- unlock_journal(journal);
jbd_debug(3, "Handle %p stalling...\n", handle);
wait_event(journal->j_wait_transaction_locked,
transaction->t_state != T_LOCKED);
@@ -181,10 +175,8 @@ repeat_locked:
prepare_to_wait(&journal->j_wait_transaction_locked, &wait,
TASK_UNINTERRUPTIBLE);
log_start_commit(journal, transaction);
- unlock_journal(journal);
schedule();
finish_wait(&journal->j_wait_transaction_locked, &wait);
- lock_journal(journal);
spin_lock(&journal->j_state_lock);
goto repeat_locked;
}
@@ -238,7 +230,6 @@ repeat_locked:
__log_space_left(journal));
spin_unlock(&transaction->t_handle_lock);
spin_unlock(&journal->j_state_lock);
- unlock_journal(journal);
return 0;
}
@@ -326,8 +317,6 @@ int journal_extend(handle_t *handle, int
int result;
int wanted;
- lock_journal(journal);
-
result = -EIO;
if (is_handle_aborted(handle))
goto error_out;
@@ -367,7 +356,6 @@ unlock:
spin_unlock(&transaction->t_handle_lock);
error_out:
spin_unlock(&journal->j_state_lock);
- unlock_journal(journal);
return result;
}
@@ -436,8 +424,6 @@ void journal_lock_updates(journal_t *jou
{
DEFINE_WAIT(wait);
- lock_journal(journal);
-
spin_lock(&journal->j_state_lock);
++journal->j_barrier_count;
@@ -457,14 +443,11 @@ void journal_lock_updates(journal_t *jou
TASK_UNINTERRUPTIBLE);
spin_unlock(&transaction->t_handle_lock);
spin_unlock(&journal->j_state_lock);
- unlock_journal(journal);
schedule();
finish_wait(&journal->j_wait_updates, &wait);
- lock_journal(journal);
spin_lock(&journal->j_state_lock);
}
spin_unlock(&journal->j_state_lock);
- unlock_journal(journal);
/*
* We have now established a barrier against other normal updates, but
@@ -485,8 +468,6 @@ void journal_lock_updates(journal_t *jou
*/
void journal_unlock_updates (journal_t *journal)
{
- lock_journal(journal);
-
J_ASSERT(journal->j_barrier_count != 0);
up(&journal->j_barrier);
@@ -494,7 +475,6 @@ void journal_unlock_updates (journal_t *
--journal->j_barrier_count;
spin_unlock(&journal->j_state_lock);
wake_up(&journal->j_wait_transaction_locked);
- unlock_journal(journal);
}
/*
@@ -645,11 +625,9 @@ repeat:
JBUFFER_TRACE(jh, "on shadow: sleep");
spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh);
- unlock_journal(journal);
/* commit wakes up all shadow buffers after IO */
wqh = bh_waitq_head(jh2bh(jh));
wait_event(*wqh, (jh->b_jlist != BJ_Shadow));
- lock_journal(journal);
goto repeat;
}
@@ -752,18 +730,14 @@ out_unlocked:
int journal_get_write_access (handle_t *handle, struct buffer_head *bh)
{
- transaction_t *transaction = handle->h_transaction;
- journal_t *journal = transaction->t_journal;
struct journal_head *jh = journal_add_journal_head(bh);
int rc;
/* We do not want to get caught playing with fields which the
* log thread also manipulates. Make sure that the buffer
* completes any outstanding IO before proceeding. */
- lock_journal(journal);
rc = do_get_write_access(handle, jh, 0);
journal_put_journal_head(jh);
- unlock_journal(journal);
return rc;
}
@@ -795,7 +769,6 @@ int journal_get_create_access(handle_t *
int err;
jbd_debug(5, "journal_head %p\n", jh);
- lock_journal(journal);
err = -EROFS;
if (is_handle_aborted(handle))
goto out;
@@ -844,7 +817,6 @@ int journal_get_create_access(handle_t *
journal_cancel_revoke(handle, jh);
journal_put_journal_head(jh);
out:
- unlock_journal(journal);
return err;
}
@@ -876,13 +848,11 @@ out:
*/
int journal_get_undo_access(handle_t *handle, struct buffer_head *bh)
{
- journal_t *journal = handle->h_transaction->t_journal;
int err;
struct journal_head *jh = journal_add_journal_head(bh);
char *committed_data = NULL;
JBUFFER_TRACE(jh, "entry");
- lock_journal(journal);
/* Do this first --- it can drop the journal lock, so we want to
* make sure that obtaining the committed_data is done
@@ -919,7 +889,6 @@ repeat:
jbd_unlock_bh_state(bh);
out:
journal_put_journal_head(jh);
- unlock_journal(journal);
if (committed_data)
kfree(committed_data);
return err;
@@ -938,8 +907,7 @@ out:
* Returns error number or 0 on success.
*
* journal_dirty_data() can be called via page_launder->ext3_writepage
- * by kswapd. So it cannot block. Happily, there's nothing here
- * which needs lock_journal if `async' is set.
+ * by kswapd.
*/
int journal_dirty_data(handle_t *handle, struct buffer_head *bh)
{
@@ -1128,9 +1096,8 @@ int journal_dirty_metadata(handle_t *han
jbd_debug(5, "journal_head %p\n", jh);
JBUFFER_TRACE(jh, "entry");
- lock_journal(journal);
if (is_handle_aborted(handle))
- goto out_unlock;
+ goto out;
jbd_lock_bh_state(bh);
spin_lock(&journal->j_list_lock);
@@ -1166,8 +1133,6 @@ done_locked:
spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh);
JBUFFER_TRACE(jh, "exit");
-out_unlock:
- unlock_journal(journal);
out:
return 0;
}
@@ -1186,7 +1151,6 @@ void journal_release_buffer(handle_t *ha
journal_t *journal = transaction->t_journal;
struct journal_head *jh = bh2jh(bh);
- lock_journal(journal);
JBUFFER_TRACE(jh, "entry");
/* If the buffer is reserved but not modified by this
@@ -1205,7 +1169,6 @@ void journal_release_buffer(handle_t *ha
jbd_unlock_bh_state(bh);
JBUFFER_TRACE(jh, "exit");
- unlock_journal(journal);
}
/**
@@ -1233,7 +1196,6 @@ void journal_forget(handle_t *handle, st
BUFFER_TRACE(bh, "entry");
- lock_journal(journal);
jbd_lock_bh_state(bh);
spin_lock(&journal->j_list_lock);
@@ -1276,7 +1238,6 @@ void journal_forget(handle_t *handle, st
if (!buffer_jbd(bh)) {
spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh);
- unlock_journal(journal);
__bforget(bh);
return;
}
@@ -1300,7 +1261,6 @@ void journal_forget(handle_t *handle, st
not_jbd:
spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh);
- unlock_journal(journal);
__brelse(bh);
return;
}
@@ -1911,7 +1871,6 @@ int journal_invalidatepage(journal_t *jo
/* We will potentially be playing with lists other than just the
* data lists (especially for journaled data mode), so be
* cautious in our locking. */
- lock_journal(journal);
head = bh = page_buffers(page);
do {
@@ -1930,8 +1889,6 @@ int journal_invalidatepage(journal_t *jo
} while (bh != head);
- unlock_journal(journal);
-
if (!offset) {
if (!may_free || !try_to_free_buffers(page))
return 0;
_