Skip to content

L
linux
Commit 0a63cac6 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files
Options

[PATCH] JBD: remove journal_datalist_lock 

This was a system-wide spinlock.

Simple transformation: make it a filesystem-wide spinlock, in the JBD
journal.

That's a bit lame, and later it might be nice to make it per-transaction_t.
But there are interesting ranking and ordering problems with that, especially
around __journal_refile_buffer().
parent 1fe87216
Hide whitespace changes
Inline Side-by-side
Showing with 111 additions and 196 deletions
fs/jbd/checkpoint.c
View file @ 0a63cac6
...@@ -23,12 +23,10 @@ ...@@ -23,12 +23,10 @@
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/slab.h> #include <linux/slab.h>
extern spinlock_t journal_datalist_lock;
/* /*
* Unlink a buffer from a transaction. * Unlink a buffer from a transaction.
* *
* Called with journal_datalist_lock held. * Called with j_list_lock held.
*/ */
static inline void __buffer_unlink(struct journal_head *jh) static inline void __buffer_unlink(struct journal_head *jh)
...@@ -49,7 +47,7 @@ static inline void __buffer_unlink(struct journal_head *jh) ...@@ -49,7 +47,7 @@ static inline void __buffer_unlink(struct journal_head *jh)
/* /*
* Try to release a checkpointed buffer from its transaction. * Try to release a checkpointed buffer from its transaction.
* Returns 1 if we released it. * Returns 1 if we released it.
* Requires journal_datalist_lock * Requires j_list_lock
* Called under jbd_lock_bh_state(jh2bh(jh)), and drops it * Called under jbd_lock_bh_state(jh2bh(jh)), and drops it
*/ */
static int __try_to_free_cp_buf(struct journal_head *jh) static int __try_to_free_cp_buf(struct journal_head *jh)
...@@ -97,14 +95,14 @@ void log_wait_for_space(journal_t *journal, int nblocks) ...@@ -97,14 +95,14 @@ void log_wait_for_space(journal_t *journal, int nblocks)
} }
/* /*
* We were unable to perform jbd_trylock_bh_state() inside * We were unable to perform jbd_trylock_bh_state() inside j_list_lock.
* journal_datalist_lock. The caller must restart a list walk. Wait for * The caller must restart a list walk. Wait for someone else to run
* someone else to run jbd_unlock_bh_state(). * jbd_unlock_bh_state().
*/ */
static void jbd_sync_bh(journal_t *journal, struct buffer_head *bh) static void jbd_sync_bh(journal_t *journal, struct buffer_head *bh)
{ {
get_bh(bh); get_bh(bh);
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
put_bh(bh); put_bh(bh);
...@@ -121,7 +119,7 @@ static void jbd_sync_bh(journal_t *journal, struct buffer_head *bh) ...@@ -121,7 +119,7 @@ static void jbd_sync_bh(journal_t *journal, struct buffer_head *bh)
* the last checkpoint buffer is cleansed) * the last checkpoint buffer is cleansed)
* *
* Called with the journal locked. * Called with the journal locked.
* Called with journal_datalist_lock held. * Called with j_list_lock held.
*/ */
static int __cleanup_transaction(journal_t *journal, transaction_t *transaction) static int __cleanup_transaction(journal_t *journal, transaction_t *transaction)
{ {
...@@ -129,7 +127,7 @@ static int __cleanup_transaction(journal_t *journal, transaction_t *transaction) ...@@ -129,7 +127,7 @@ static int __cleanup_transaction(journal_t *journal, transaction_t *transaction)
struct buffer_head *bh; struct buffer_head *bh;
int ret = 0; int ret = 0;
assert_spin_locked(&journal_datalist_lock); assert_spin_locked(&journal->j_list_lock);
jh = transaction->t_checkpoint_list; jh = transaction->t_checkpoint_list;
if (!jh) if (!jh)
return 0; return 0;
...@@ -141,7 +139,7 @@ static int __cleanup_transaction(journal_t *journal, transaction_t *transaction) ...@@ -141,7 +139,7 @@ static int __cleanup_transaction(journal_t *journal, transaction_t *transaction)
bh = jh2bh(jh); bh = jh2bh(jh);
if (buffer_locked(bh)) { if (buffer_locked(bh)) {
atomic_inc(&bh->b_count); atomic_inc(&bh->b_count);
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
unlock_journal(journal); unlock_journal(journal);
wait_on_buffer(bh); wait_on_buffer(bh);
/* the journal_head may have gone by now */ /* the journal_head may have gone by now */
...@@ -162,7 +160,7 @@ static int __cleanup_transaction(journal_t *journal, transaction_t *transaction) ...@@ -162,7 +160,7 @@ static int __cleanup_transaction(journal_t *journal, transaction_t *transaction)
transaction_t *transaction = jh->b_transaction; transaction_t *transaction = jh->b_transaction;
tid_t tid = transaction->t_tid; tid_t tid = transaction->t_tid;
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
log_start_commit(journal, transaction); log_start_commit(journal, transaction);
unlock_journal(journal); unlock_journal(journal);
...@@ -196,20 +194,20 @@ static int __cleanup_transaction(journal_t *journal, transaction_t *transaction) ...@@ -196,20 +194,20 @@ static int __cleanup_transaction(journal_t *journal, transaction_t *transaction)
return ret; return ret;
out_return_1: out_return_1:
lock_journal(journal); lock_journal(journal);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
return 1; return 1;
} }
#define NR_BATCH 64 #define NR_BATCH 64
static void __flush_batch(struct buffer_head **bhs, int *batch_count) static void
__flush_batch(journal_t *journal, struct buffer_head **bhs, int *batch_count)
{ {
int i; int i;
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
ll_rw_block(WRITE, *batch_count, bhs); ll_rw_block(WRITE, *batch_count, bhs);
blk_run_queues(); spin_lock(&journal->j_list_lock);
spin_lock(&journal_datalist_lock);
for (i = 0; i < *batch_count; i++) { for (i = 0; i < *batch_count; i++) {
struct buffer_head *bh = bhs[i]; struct buffer_head *bh = bhs[i];
clear_bit(BH_JWrite, &bh->b_state); clear_bit(BH_JWrite, &bh->b_state);
...@@ -225,7 +223,7 @@ static void __flush_batch(struct buffer_head **bhs, int *batch_count) ...@@ -225,7 +223,7 @@ static void __flush_batch(struct buffer_head **bhs, int *batch_count)
* Return 1 if something happened which requires us to abort the current * Return 1 if something happened which requires us to abort the current
* scan of the checkpoint list. * scan of the checkpoint list.
* *
* Called with journal_datalist_lock held. * Called with j_list_lock held.
* Called under jbd_lock_bh_state(jh2bh(jh)), and drops it * Called under jbd_lock_bh_state(jh2bh(jh)), and drops it
*/ */
static int __flush_buffer(journal_t *journal, struct journal_head *jh, static int __flush_buffer(journal_t *journal, struct journal_head *jh,
...@@ -253,7 +251,7 @@ static int __flush_buffer(journal_t *journal, struct journal_head *jh, ...@@ -253,7 +251,7 @@ static int __flush_buffer(journal_t *journal, struct journal_head *jh,
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
(*batch_count)++; (*batch_count)++;
if (*batch_count == NR_BATCH) { if (*batch_count == NR_BATCH) {
__flush_batch(bhs, batch_count); __flush_batch(journal, bhs, batch_count);
ret = 1; ret = 1;
} }
} else { } else {
...@@ -287,7 +285,7 @@ static int __flush_buffer(journal_t *journal, struct journal_head *jh, ...@@ -287,7 +285,7 @@ static int __flush_buffer(journal_t *journal, struct journal_head *jh,
*/ */
/* @@@ `nblocks' is unused. Should it be used? */ /* @@@ `nblocks' is unused. Should it be used? */
int log_do_checkpoint (journal_t *journal, int nblocks) int log_do_checkpoint(journal_t *journal, int nblocks)
{ {
transaction_t *transaction, *last_transaction, *next_transaction; transaction_t *transaction, *last_transaction, *next_transaction;
int result; int result;
...@@ -314,7 +312,7 @@ int log_do_checkpoint (journal_t *journal, int nblocks) ...@@ -314,7 +312,7 @@ int log_do_checkpoint (journal_t *journal, int nblocks)
* AKPM: check this code. I had a feeling a while back that it * AKPM: check this code. I had a feeling a while back that it
* degenerates into a busy loop at unmount time. * degenerates into a busy loop at unmount time.
*/ */
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
repeat: repeat:
transaction = journal->j_checkpoint_transactions; transaction = journal->j_checkpoint_transactions;
if (transaction == NULL) if (transaction == NULL)
...@@ -340,14 +338,14 @@ int log_do_checkpoint (journal_t *journal, int nblocks) ...@@ -340,14 +338,14 @@ int log_do_checkpoint (journal_t *journal, int nblocks)
bh = jh2bh(jh); bh = jh2bh(jh);
if (!jbd_trylock_bh_state(bh)) { if (!jbd_trylock_bh_state(bh)) {
jbd_sync_bh(journal, bh); jbd_sync_bh(journal, bh);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
break; break;
} }
retry = __flush_buffer(journal, jh, bhs, &batch_count, retry = __flush_buffer(journal, jh, bhs, &batch_count,
&drop_count); &drop_count);
} while (jh != last_jh && !retry); } while (jh != last_jh && !retry);
if (batch_count) { if (batch_count) {
__flush_batch(bhs, &batch_count); __flush_batch(journal, bhs, &batch_count);
goto repeat; goto repeat;
} }
if (retry) if (retry)
...@@ -363,7 +361,7 @@ int log_do_checkpoint (journal_t *journal, int nblocks) ...@@ -363,7 +361,7 @@ int log_do_checkpoint (journal_t *journal, int nblocks)
} while (transaction != last_transaction); } while (transaction != last_transaction);
done: done:
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
result = cleanup_journal_tail(journal); result = cleanup_journal_tail(journal);
if (result < 0) if (result < 0)
return result; return result;
...@@ -402,7 +400,7 @@ int cleanup_journal_tail(journal_t *journal) ...@@ -402,7 +400,7 @@ int cleanup_journal_tail(journal_t *journal)
* start. */ * start. */
/* j_checkpoint_transactions needs locking */ /* j_checkpoint_transactions needs locking */
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
transaction = journal->j_checkpoint_transactions; transaction = journal->j_checkpoint_transactions;
if (transaction) { if (transaction) {
first_tid = transaction->t_tid; first_tid = transaction->t_tid;
...@@ -417,7 +415,7 @@ int cleanup_journal_tail(journal_t *journal) ...@@ -417,7 +415,7 @@ int cleanup_journal_tail(journal_t *journal)
first_tid = journal->j_transaction_sequence; first_tid = journal->j_transaction_sequence;
blocknr = journal->j_head; blocknr = journal->j_head;
} }
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
J_ASSERT (blocknr != 0); J_ASSERT (blocknr != 0);
/* If the oldest pinned transaction is at the tail of the log /* If the oldest pinned transaction is at the tail of the log
...@@ -454,7 +452,7 @@ int cleanup_journal_tail(journal_t *journal) ...@@ -454,7 +452,7 @@ int cleanup_journal_tail(journal_t *journal)
* Find all the written-back checkpoint buffers in the journal and release them. * Find all the written-back checkpoint buffers in the journal and release them.
* *
* Called with the journal locked. * Called with the journal locked.
* Called with journal_datalist_lock held. * Called with j_list_lock held.
* Returns number of bufers reaped (for debug) * Returns number of bufers reaped (for debug)
*/ */
...@@ -506,7 +504,7 @@ int __journal_clean_checkpoint_list(journal_t *journal) ...@@ -506,7 +504,7 @@ int __journal_clean_checkpoint_list(journal_t *journal)
* checkpoint list. * checkpoint list.
* *
* This function is called with the journal locked. * This function is called with the journal locked.
* This function is called with journal_datalist_lock held. * This function is called with j_list_lock held.
*/ */
void __journal_remove_checkpoint(struct journal_head *jh) void __journal_remove_checkpoint(struct journal_head *jh)
...@@ -551,20 +549,13 @@ void __journal_remove_checkpoint(struct journal_head *jh) ...@@ -551,20 +549,13 @@ void __journal_remove_checkpoint(struct journal_head *jh)
JBUFFER_TRACE(jh, "exit"); JBUFFER_TRACE(jh, "exit");
} }
void journal_remove_checkpoint(struct journal_head *jh)
{
spin_lock(&journal_datalist_lock);
__journal_remove_checkpoint(jh);
spin_unlock(&journal_datalist_lock);
}
/* /*
* journal_insert_checkpoint: put a committed buffer onto a checkpoint * journal_insert_checkpoint: put a committed buffer onto a checkpoint
* list so that we know when it is safe to clean the transaction out of * list so that we know when it is safe to clean the transaction out of
* the log. * the log.
* *
* Called with the journal locked. * Called with the journal locked.
* Called with journal_datalist_lock held. * Called with j_list_lock held.
*/ */
void __journal_insert_checkpoint(struct journal_head *jh, void __journal_insert_checkpoint(struct journal_head *jh,
transaction_t *transaction) transaction_t *transaction)
...@@ -573,7 +564,6 @@ void __journal_insert_checkpoint(struct journal_head *jh, ...@@ -573,7 +564,6 @@ void __journal_insert_checkpoint(struct journal_head *jh,
J_ASSERT_JH(jh, buffer_dirty(jh2bh(jh)) || buffer_jbddirty(jh2bh(jh))); J_ASSERT_JH(jh, buffer_dirty(jh2bh(jh)) || buffer_jbddirty(jh2bh(jh)));
J_ASSERT_JH(jh, jh->b_cp_transaction == NULL); J_ASSERT_JH(jh, jh->b_cp_transaction == NULL);
assert_spin_locked(&journal_datalist_lock);
jh->b_cp_transaction = transaction; jh->b_cp_transaction = transaction;
if (!transaction->t_checkpoint_list) { if (!transaction->t_checkpoint_list) {
...@@ -587,14 +577,6 @@ void __journal_insert_checkpoint(struct journal_head *jh, ...@@ -587,14 +577,6 @@ void __journal_insert_checkpoint(struct journal_head *jh,
transaction->t_checkpoint_list = jh; transaction->t_checkpoint_list = jh;
} }
void journal_insert_checkpoint(struct journal_head *jh,
transaction_t *transaction)
{
spin_lock(&journal_datalist_lock);
__journal_insert_checkpoint(jh, transaction);
spin_unlock(&journal_datalist_lock);
}
/* /*
* We've finished with this transaction structure: adios... * We've finished with this transaction structure: adios...
* *
...@@ -602,12 +584,12 @@ void journal_insert_checkpoint(struct journal_head *jh, ...@@ -602,12 +584,12 @@ void journal_insert_checkpoint(struct journal_head *jh,
* point. * point.
* *
* Called with the journal locked. * Called with the journal locked.
* Called with journal_datalist_lock held. * Called with j_list_lock held.
*/ */
void __journal_drop_transaction(journal_t *journal, transaction_t *transaction) void __journal_drop_transaction(journal_t *journal, transaction_t *transaction)
{ {
assert_spin_locked(&journal_datalist_lock); assert_spin_locked(&journal->j_list_lock);
if (transaction->t_cpnext) { if (transaction->t_cpnext) {
transaction->t_cpnext->t_cpprev = transaction->t_cpprev; transaction->t_cpnext->t_cpprev = transaction->t_cpprev;
transaction->t_cpprev->t_cpnext = transaction->t_cpnext; transaction->t_cpprev->t_cpnext = transaction->t_cpnext;
......
fs/jbd/commit.c
View file @ 0a63cac6
...@@ -20,8 +20,6 @@ ...@@ -20,8 +20,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/smp_lock.h> #include <linux/smp_lock.h>
extern spinlock_t journal_datalist_lock;
/* /*
* Default IO end handler for temporary BJ_IO buffer_heads. * Default IO end handler for temporary BJ_IO buffer_heads.
*/ */
...@@ -67,9 +65,9 @@ void journal_commit_transaction(journal_t *journal) ...@@ -67,9 +65,9 @@ void journal_commit_transaction(journal_t *journal)
lock_journal(journal); /* Protect journal->j_running_transaction */ lock_journal(journal); /* Protect journal->j_running_transaction */
#ifdef COMMIT_STATS #ifdef COMMIT_STATS
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
summarise_journal_usage(journal); summarise_journal_usage(journal);
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
#endif #endif
lock_kernel(); lock_kernel();
...@@ -121,7 +119,7 @@ void journal_commit_transaction(journal_t *journal) ...@@ -121,7 +119,7 @@ void journal_commit_transaction(journal_t *journal)
while (commit_transaction->t_reserved_list) { while (commit_transaction->t_reserved_list) {
jh = commit_transaction->t_reserved_list; jh = commit_transaction->t_reserved_list;
JBUFFER_TRACE(jh, "reserved, unused: refile"); JBUFFER_TRACE(jh, "reserved, unused: refile");
journal_refile_buffer(jh); journal_refile_buffer(journal, jh);
} }
/* /*
...@@ -129,9 +127,9 @@ void journal_commit_transaction(journal_t *journal) ...@@ -129,9 +127,9 @@ void journal_commit_transaction(journal_t *journal)
* checkpoint lists. We do this *before* commit because it potentially * checkpoint lists. We do this *before* commit because it potentially
* frees some memory * frees some memory
*/ */
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
__journal_clean_checkpoint_list(journal); __journal_clean_checkpoint_list(journal);
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
/* First part of the commit: force the revoke list out to disk. /* First part of the commit: force the revoke list out to disk.
* The revoke code generates its own metadata blocks on disk for this. * The revoke code generates its own metadata blocks on disk for this.
...@@ -185,10 +183,10 @@ void journal_commit_transaction(journal_t *journal) ...@@ -185,10 +183,10 @@ void journal_commit_transaction(journal_t *journal)
* Cleanup any flushed data buffers from the data list. Even in * Cleanup any flushed data buffers from the data list. Even in
* abort mode, we want to flush this out as soon as possible. * abort mode, we want to flush this out as soon as possible.
* *
* We take journal_datalist_lock to protect the lists from * We take j_list_lock to protect the lists from
* journal_try_to_free_buffers(). * journal_try_to_free_buffers().
*/ */
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
write_out_data_locked: write_out_data_locked:
bufs = 0; bufs = 0;
...@@ -214,9 +212,9 @@ void journal_commit_transaction(journal_t *journal) ...@@ -214,9 +212,9 @@ void journal_commit_transaction(journal_t *journal)
* We have a lock ranking problem.. * We have a lock ranking problem..
*/ */
if (!jbd_trylock_bh_state(bh)) { if (!jbd_trylock_bh_state(bh)) {
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
schedule(); schedule();
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
break; break;
} }
__journal_unfile_buffer(jh); __journal_unfile_buffer(jh);
...@@ -238,14 +236,14 @@ void journal_commit_transaction(journal_t *journal) ...@@ -238,14 +236,14 @@ void journal_commit_transaction(journal_t *journal)
if (bufs || need_resched()) { if (bufs || need_resched()) {
jbd_debug(2, "submit %d writes\n", bufs); jbd_debug(2, "submit %d writes\n", bufs);
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
unlock_journal(journal); unlock_journal(journal);
if (bufs) if (bufs)
ll_rw_block(WRITE, bufs, wbuf); ll_rw_block(WRITE, bufs, wbuf);
cond_resched(); cond_resched();
journal_brelse_array(wbuf, bufs); journal_brelse_array(wbuf, bufs);
lock_journal(journal); lock_journal(journal);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
if (bufs) if (bufs)
goto write_out_data_locked; goto write_out_data_locked;
} }
...@@ -263,7 +261,7 @@ void journal_commit_transaction(journal_t *journal) ...@@ -263,7 +261,7 @@ void journal_commit_transaction(journal_t *journal)
bh = jh2bh(jh); bh = jh2bh(jh);
if (buffer_locked(bh)) { if (buffer_locked(bh)) {
get_bh(bh); get_bh(bh);
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
unlock_journal(journal); unlock_journal(journal);
wait_on_buffer(bh); wait_on_buffer(bh);
if (unlikely(!buffer_uptodate(bh))) if (unlikely(!buffer_uptodate(bh)))
...@@ -279,7 +277,7 @@ void journal_commit_transaction(journal_t *journal) ...@@ -279,7 +277,7 @@ void journal_commit_transaction(journal_t *journal)
goto write_out_data_locked; goto write_out_data_locked;
sync_datalist_empty: sync_datalist_empty:
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
/* /*
* If we found any dirty or locked buffers, then we should have * If we found any dirty or locked buffers, then we should have
...@@ -311,7 +309,7 @@ void journal_commit_transaction(journal_t *journal) ...@@ -311,7 +309,7 @@ void journal_commit_transaction(journal_t *journal)
if (is_journal_aborted(journal)) { if (is_journal_aborted(journal)) {
JBUFFER_TRACE(jh, "journal is aborting: refile"); JBUFFER_TRACE(jh, "journal is aborting: refile");
journal_refile_buffer(jh); journal_refile_buffer(journal, jh);
/* If that was the last one, we need to clean up /* If that was the last one, we need to clean up
* any descriptor buffers which may have been * any descriptor buffers which may have been
* already allocated, even if we are now * already allocated, even if we are now
...@@ -355,7 +353,7 @@ void journal_commit_transaction(journal_t *journal) ...@@ -355,7 +353,7 @@ void journal_commit_transaction(journal_t *journal)
completion later */ completion later */
BUFFER_TRACE(bh, "ph3: file as descriptor"); BUFFER_TRACE(bh, "ph3: file as descriptor");
journal_file_buffer(descriptor, commit_transaction, journal_file_buffer(descriptor, commit_transaction,
BJ_LogCtl); BJ_LogCtl);
} }
/* Where is the buffer to be written? */ /* Where is the buffer to be written? */
...@@ -462,7 +460,7 @@ void journal_commit_transaction(journal_t *journal) ...@@ -462,7 +460,7 @@ void journal_commit_transaction(journal_t *journal)
jbd_debug(3, "JBD: commit phase 4\n"); jbd_debug(3, "JBD: commit phase 4\n");
/* /*
* akpm: these are BJ_IO, and journal_datalist_lock is not needed. * akpm: these are BJ_IO, and j_list_lock is not needed.
* See __journal_try_to_free_buffer. * See __journal_try_to_free_buffer.
*/ */
wait_for_iobuf: wait_for_iobuf:
...@@ -483,7 +481,7 @@ void journal_commit_transaction(journal_t *journal) ...@@ -483,7 +481,7 @@ void journal_commit_transaction(journal_t *journal)
clear_buffer_jwrite(bh); clear_buffer_jwrite(bh);
JBUFFER_TRACE(jh, "ph4: unfile after journal write"); JBUFFER_TRACE(jh, "ph4: unfile after journal write");
journal_unfile_buffer(jh); journal_unfile_buffer(journal, jh);
/* /*
* akpm: don't put back a buffer_head with stale pointers * akpm: don't put back a buffer_head with stale pointers
...@@ -543,8 +541,8 @@ void journal_commit_transaction(journal_t *journal) ...@@ -543,8 +541,8 @@ void journal_commit_transaction(journal_t *journal)
} }
BUFFER_TRACE(bh, "ph5: control buffer writeout done: unfile"); BUFFER_TRACE(bh, "ph5: control buffer writeout done: unfile");
clear_bit(BH_JWrite, &bh->b_state); clear_buffer_jwrite(bh);
journal_unfile_buffer(jh); journal_unfile_buffer(journal, jh);
jh->b_transaction = NULL; jh->b_transaction = NULL;
journal_put_journal_head(jh); journal_put_journal_head(jh);
__brelse(bh); /* One for getblk */ __brelse(bh); /* One for getblk */
...@@ -664,7 +662,7 @@ void journal_commit_transaction(journal_t *journal) ...@@ -664,7 +662,7 @@ void journal_commit_transaction(journal_t *journal)
jh->b_frozen_data = NULL; jh->b_frozen_data = NULL;
} }
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
cp_transaction = jh->b_cp_transaction; cp_transaction = jh->b_cp_transaction;
if (cp_transaction) { if (cp_transaction) {
JBUFFER_TRACE(jh, "remove from old cp transaction"); JBUFFER_TRACE(jh, "remove from old cp transaction");
...@@ -706,7 +704,7 @@ void journal_commit_transaction(journal_t *journal) ...@@ -706,7 +704,7 @@ void journal_commit_transaction(journal_t *journal)
journal_remove_journal_head(bh); journal_remove_journal_head(bh);
__brelse(bh); __brelse(bh);
} }
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
} }
/* Done with this transaction! */ /* Done with this transaction! */
...@@ -720,7 +718,7 @@ void journal_commit_transaction(journal_t *journal) ...@@ -720,7 +718,7 @@ void journal_commit_transaction(journal_t *journal)
journal->j_commit_sequence = commit_transaction->t_tid; journal->j_commit_sequence = commit_transaction->t_tid;
journal->j_committing_transaction = NULL; journal->j_committing_transaction = NULL;
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
if (commit_transaction->t_checkpoint_list == NULL) { if (commit_transaction->t_checkpoint_list == NULL) {
__journal_drop_transaction(journal, commit_transaction); __journal_drop_transaction(journal, commit_transaction);
} else { } else {
...@@ -739,7 +737,7 @@ void journal_commit_transaction(journal_t *journal) ...@@ -739,7 +737,7 @@ void journal_commit_transaction(journal_t *journal)
commit_transaction; commit_transaction;
} }
} }
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_debug(1, "JBD: commit %d complete, head %d\n", jbd_debug(1, "JBD: commit %d complete, head %d\n",
journal->j_commit_sequence, journal->j_tail_sequence); journal->j_commit_sequence, journal->j_tail_sequence);
......
fs/jbd/journal.c
View file @ 0a63cac6
...@@ -83,39 +83,6 @@ EXPORT_SYMBOL(journal_force_commit); ...@@ -83,39 +83,6 @@ EXPORT_SYMBOL(journal_force_commit);
static int journal_convert_superblock_v1(journal_t *, journal_superblock_t *); static int journal_convert_superblock_v1(journal_t *, journal_superblock_t *);
/*
* journal_datalist_lock is used to protect data buffers:
*
* bh->b_transaction
* bh->b_tprev
* bh->b_tnext
*
* journal_free_buffer() is called from journal_try_to_free_buffer(), and is
* async wrt everything else.
*
* It is also used for checkpoint data, also to protect against
* journal_try_to_free_buffer():
*
* bh->b_cp_transaction
* bh->b_cpnext
* bh->b_cpprev
* transaction->t_checkpoint_list
* transaction->t_cpnext
* transaction->t_cpprev
* journal->j_checkpoint_transactions
*
* It is global at this time rather than per-journal because it's
* impossible for __journal_free_buffer to go from a buffer_head
* back to a journal_t unracily (well, not true. Fix later)
*
*
* The `datalist' and `checkpoint list' functions are quite
* separate and we could use two spinlocks here.
*
* lru_list_lock nests inside journal_datalist_lock.
*/
spinlock_t journal_datalist_lock = SPIN_LOCK_UNLOCKED;
/* /*
* List of all journals in the system. Protected by the BKL. * List of all journals in the system. Protected by the BKL.
*/ */
...@@ -1515,26 +1482,6 @@ int journal_blocks_per_page(struct inode *inode) ...@@ -1515,26 +1482,6 @@ int journal_blocks_per_page(struct inode *inode)
return 1 << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits); return 1 << (PAGE_CACHE_SHIFT - inode->i_sb->s_blocksize_bits);
} }
/*
* shrink_journal_memory().
* Called when we're under memory pressure. Free up all the written-back
* checkpointed metadata buffers.
*/
void shrink_journal_memory(void)
{
struct list_head *list;
lock_kernel();
list_for_each(list, &all_journals) {
journal_t *journal =
list_entry(list, journal_t, j_all_journals);
spin_lock(&journal_datalist_lock);
__journal_clean_checkpoint_list(journal);
spin_unlock(&journal_datalist_lock);
}
unlock_kernel();
}
/* /*
* Simple support for retying memory allocations. Introduced to help to * Simple support for retying memory allocations. Introduced to help to
* debug different VM deadlock avoidance strategies. * debug different VM deadlock avoidance strategies.
...@@ -1660,7 +1607,6 @@ static void journal_free_journal_head(struct journal_head *jh) ...@@ -1660,7 +1607,6 @@ static void journal_free_journal_head(struct journal_head *jh)
* *
* Doesn't need the journal lock. * Doesn't need the journal lock.
* May sleep. * May sleep.
* Cannot be called with journal_datalist_lock held.
*/ */
struct journal_head *journal_add_journal_head(struct buffer_head *bh) struct journal_head *journal_add_journal_head(struct buffer_head *bh)
{ {
......
fs/jbd/transaction.c
View file @ 0a63cac6
...@@ -27,8 +27,6 @@ ...@@ -27,8 +27,6 @@
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/highmem.h> #include <linux/highmem.h>
extern spinlock_t journal_datalist_lock;
/* /*
* get_transaction: obtain a new transaction_t object. * get_transaction: obtain a new transaction_t object.
* *
...@@ -457,7 +455,7 @@ void journal_unlock_updates (journal_t *journal) ...@@ -457,7 +455,7 @@ void journal_unlock_updates (journal_t *journal)
* continuing as gracefully as possible. # * continuing as gracefully as possible. #
* *
* The caller should already hold the journal lock and * The caller should already hold the journal lock and
* journal_datalist_lock spinlock: most callers will need those anyway * j_list_lock spinlock: most callers will need those anyway
* in order to probe the buffer's journaling state safely. * in order to probe the buffer's journaling state safely.
*/ */
static void jbd_unexpected_dirty_buffer(struct journal_head *jh) static void jbd_unexpected_dirty_buffer(struct journal_head *jh)
...@@ -513,7 +511,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, int force_copy) ...@@ -513,7 +511,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, int force_copy)
lock_buffer(bh); lock_buffer(bh);
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
/* We now hold the buffer lock so it is safe to query the buffer /* We now hold the buffer lock so it is safe to query the buffer
* state. Is the buffer dirty? * state. Is the buffer dirty?
...@@ -549,7 +547,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, int force_copy) ...@@ -549,7 +547,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, int force_copy)
error = -EROFS; error = -EROFS;
if (is_handle_aborted(handle)) { if (is_handle_aborted(handle)) {
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
goto out_unlocked; goto out_unlocked;
} }
...@@ -596,7 +594,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, int force_copy) ...@@ -596,7 +594,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, int force_copy)
wait_queue_head_t *wqh; wait_queue_head_t *wqh;
JBUFFER_TRACE(jh, "on shadow: sleep"); JBUFFER_TRACE(jh, "on shadow: sleep");
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
unlock_journal(journal); unlock_journal(journal);
/* commit wakes up all shadow buffers after IO */ /* commit wakes up all shadow buffers after IO */
...@@ -624,7 +622,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, int force_copy) ...@@ -624,7 +622,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, int force_copy)
JBUFFER_TRACE(jh, "generate frozen data"); JBUFFER_TRACE(jh, "generate frozen data");
if (!frozen_buffer) { if (!frozen_buffer) {
JBUFFER_TRACE(jh, "allocate memory for buffer"); JBUFFER_TRACE(jh, "allocate memory for buffer");
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
frozen_buffer = jbd_kmalloc(jh2bh(jh)->b_size, frozen_buffer = jbd_kmalloc(jh2bh(jh)->b_size,
GFP_NOFS); GFP_NOFS);
...@@ -635,7 +633,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, int force_copy) ...@@ -635,7 +633,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, int force_copy)
JBUFFER_TRACE(jh, "oom!"); JBUFFER_TRACE(jh, "oom!");
error = -ENOMEM; error = -ENOMEM;
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
goto done_locked; goto done_locked;
} }
goto repeat; goto repeat;
...@@ -677,7 +675,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, int force_copy) ...@@ -677,7 +675,7 @@ do_get_write_access(handle_t *handle, struct journal_head *jh, int force_copy)
memcpy(jh->b_frozen_data, source+offset, jh2bh(jh)->b_size); memcpy(jh->b_frozen_data, source+offset, jh2bh(jh)->b_size);
kunmap_atomic(source, KM_USER0); kunmap_atomic(source, KM_USER0);
} }
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
/* If we are about to journal a buffer, then any revoke pending /* If we are about to journal a buffer, then any revoke pending
...@@ -763,7 +761,7 @@ int journal_get_create_access(handle_t *handle, struct buffer_head *bh) ...@@ -763,7 +761,7 @@ int journal_get_create_access(handle_t *handle, struct buffer_head *bh)
* reused here. * reused here.
*/ */
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
J_ASSERT_JH(jh, (jh->b_transaction == transaction || J_ASSERT_JH(jh, (jh->b_transaction == transaction ||
jh->b_transaction == NULL || jh->b_transaction == NULL ||
(jh->b_transaction == journal->j_committing_transaction && (jh->b_transaction == journal->j_committing_transaction &&
...@@ -783,7 +781,7 @@ int journal_get_create_access(handle_t *handle, struct buffer_head *bh) ...@@ -783,7 +781,7 @@ int journal_get_create_access(handle_t *handle, struct buffer_head *bh)
JBUFFER_TRACE(jh, "set next transaction"); JBUFFER_TRACE(jh, "set next transaction");
jh->b_next_transaction = transaction; jh->b_next_transaction = transaction;
} }
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
/* /*
...@@ -936,7 +934,7 @@ int journal_dirty_data (handle_t *handle, struct buffer_head *bh) ...@@ -936,7 +934,7 @@ int journal_dirty_data (handle_t *handle, struct buffer_head *bh)
* about it in this layer. * about it in this layer.
*/ */
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
if (jh->b_transaction) { if (jh->b_transaction) {
JBUFFER_TRACE(jh, "has transaction"); JBUFFER_TRACE(jh, "has transaction");
if (jh->b_transaction != handle->h_transaction) { if (jh->b_transaction != handle->h_transaction) {
...@@ -991,12 +989,12 @@ int journal_dirty_data (handle_t *handle, struct buffer_head *bh) ...@@ -991,12 +989,12 @@ int journal_dirty_data (handle_t *handle, struct buffer_head *bh)
*/ */
if (buffer_dirty(bh)) { if (buffer_dirty(bh)) {
get_bh(bh); get_bh(bh);
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
need_brelse = 1; need_brelse = 1;
sync_dirty_buffer(bh); sync_dirty_buffer(bh);
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
/* The buffer may become locked again at any /* The buffer may become locked again at any
time if it is redirtied */ time if it is redirtied */
} }
...@@ -1030,7 +1028,7 @@ int journal_dirty_data (handle_t *handle, struct buffer_head *bh) ...@@ -1030,7 +1028,7 @@ int journal_dirty_data (handle_t *handle, struct buffer_head *bh)
__journal_file_buffer(jh, handle->h_transaction, BJ_SyncData); __journal_file_buffer(jh, handle->h_transaction, BJ_SyncData);
} }
no_journal: no_journal:
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
if (need_brelse) { if (need_brelse) {
BUFFER_TRACE(bh, "brelse"); BUFFER_TRACE(bh, "brelse");
...@@ -1073,7 +1071,7 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) ...@@ -1073,7 +1071,7 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
goto out_unlock; goto out_unlock;
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
set_buffer_jbddirty(bh); set_buffer_jbddirty(bh);
J_ASSERT_JH(jh, jh->b_transaction != NULL); J_ASSERT_JH(jh, jh->b_transaction != NULL);
...@@ -1104,7 +1102,7 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) ...@@ -1104,7 +1102,7 @@ int journal_dirty_metadata(handle_t *handle, struct buffer_head *bh)
__journal_file_buffer(jh, handle->h_transaction, BJ_Metadata); __journal_file_buffer(jh, handle->h_transaction, BJ_Metadata);
done_locked: done_locked:
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
JBUFFER_TRACE(jh, "exit"); JBUFFER_TRACE(jh, "exit");
out_unlock: out_unlock:
...@@ -1134,14 +1132,14 @@ void journal_release_buffer(handle_t *handle, struct buffer_head *bh) ...@@ -1134,14 +1132,14 @@ void journal_release_buffer(handle_t *handle, struct buffer_head *bh)
* cases, just leave the buffer as it is. */ * cases, just leave the buffer as it is. */
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
if (jh->b_jlist == BJ_Reserved && jh->b_transaction == transaction && if (jh->b_jlist == BJ_Reserved && jh->b_transaction == transaction &&
!buffer_jbddirty(jh2bh(jh))) { !buffer_jbddirty(jh2bh(jh))) {
JBUFFER_TRACE(jh, "unused: refiling it"); JBUFFER_TRACE(jh, "unused: refiling it");
handle->h_buffer_credits++; handle->h_buffer_credits++;
__journal_refile_buffer(jh); __journal_refile_buffer(jh);
} }
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
JBUFFER_TRACE(jh, "exit"); JBUFFER_TRACE(jh, "exit");
...@@ -1175,7 +1173,7 @@ void journal_forget (handle_t *handle, struct buffer_head *bh) ...@@ -1175,7 +1173,7 @@ void journal_forget (handle_t *handle, struct buffer_head *bh)
lock_journal(journal); lock_journal(journal);
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
if (!buffer_jbd(bh)) if (!buffer_jbd(bh))
goto not_jbd; goto not_jbd;
...@@ -1214,7 +1212,7 @@ void journal_forget (handle_t *handle, struct buffer_head *bh) ...@@ -1214,7 +1212,7 @@ void journal_forget (handle_t *handle, struct buffer_head *bh)
journal_remove_journal_head(bh); journal_remove_journal_head(bh);
__brelse(bh); __brelse(bh);
if (!buffer_jbd(bh)) { if (!buffer_jbd(bh)) {
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
unlock_journal(journal); unlock_journal(journal);
__bforget(bh); __bforget(bh);
...@@ -1238,7 +1236,7 @@ void journal_forget (handle_t *handle, struct buffer_head *bh) ...@@ -1238,7 +1236,7 @@ void journal_forget (handle_t *handle, struct buffer_head *bh)
} }
not_jbd: not_jbd:
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
unlock_journal(journal); unlock_journal(journal);
__brelse(bh); __brelse(bh);
...@@ -1415,7 +1413,7 @@ int journal_force_commit(journal_t *journal) ...@@ -1415,7 +1413,7 @@ int journal_force_commit(journal_t *journal)
* Append a buffer to a transaction list, given the transaction's list head * Append a buffer to a transaction list, given the transaction's list head
* pointer. * pointer.
* *
* journal_datalist_lock is held. * j_list_lock is held.
* *
* jbd_lock_bh_state(jh2bh(jh)) is held. * jbd_lock_bh_state(jh2bh(jh)) is held.
*/ */
...@@ -1439,8 +1437,7 @@ __blist_add_buffer(struct journal_head **list, struct journal_head *jh) ...@@ -1439,8 +1437,7 @@ __blist_add_buffer(struct journal_head **list, struct journal_head *jh)
* Remove a buffer from a transaction list, given the transaction's list * Remove a buffer from a transaction list, given the transaction's list
* head pointer. * head pointer.
* *
* Called with journal_datalist_lock held, and the journal may not * Called with j_list_lock held, and the journal may not be locked.
* be locked.
* *
* jbd_lock_bh_state(jh2bh(jh)) is held. * jbd_lock_bh_state(jh2bh(jh)) is held.
*/ */
...@@ -1468,7 +1465,7 @@ __blist_del_buffer(struct journal_head **list, struct journal_head *jh) ...@@ -1468,7 +1465,7 @@ __blist_del_buffer(struct journal_head **list, struct journal_head *jh)
* *
* If bh->b_jlist is BJ_SyncData then we may have been called * If bh->b_jlist is BJ_SyncData then we may have been called
* via journal_try_to_free_buffer() or journal_clean_data_list(). In that * via journal_try_to_free_buffer() or journal_clean_data_list(). In that
* case, journal_datalist_lock will be held, and the journal may not be locked. * case, j_list_lock will be held, and the journal may not be locked.
*/ */
void __journal_unfile_buffer(struct journal_head *jh) void __journal_unfile_buffer(struct journal_head *jh)
{ {
...@@ -1476,8 +1473,9 @@ void __journal_unfile_buffer(struct journal_head *jh) ...@@ -1476,8 +1473,9 @@ void __journal_unfile_buffer(struct journal_head *jh)
transaction_t *transaction; transaction_t *transaction;
struct buffer_head *bh = jh2bh(jh); struct buffer_head *bh = jh2bh(jh);
assert_spin_locked(&journal_datalist_lock);
transaction = jh->b_transaction; transaction = jh->b_transaction;
if (transaction)
assert_spin_locked(&transaction->t_journal->j_list_lock);
J_ASSERT_JH(jh, jh->b_jlist < BJ_Types); J_ASSERT_JH(jh, jh->b_jlist < BJ_Types);
if (jh->b_jlist != BJ_None) if (jh->b_jlist != BJ_None)
...@@ -1517,31 +1515,24 @@ void __journal_unfile_buffer(struct journal_head *jh) ...@@ -1517,31 +1515,24 @@ void __journal_unfile_buffer(struct journal_head *jh)
mark_buffer_dirty(bh); /* Expose it to the VM */ mark_buffer_dirty(bh); /* Expose it to the VM */
} }
void journal_unfile_buffer(struct journal_head *jh) void journal_unfile_buffer(journal_t *journal, struct journal_head *jh)
{ {
jbd_lock_bh_state(jh2bh(jh)); jbd_lock_bh_state(jh2bh(jh));
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
__journal_unfile_buffer(jh); __journal_unfile_buffer(jh);
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(jh2bh(jh)); jbd_unlock_bh_state(jh2bh(jh));
} }
/* /*
* Called from journal_try_to_free_buffers(). The journal is not * Called from journal_try_to_free_buffers().
* locked. lru_list_lock is not held.
*
* Here we see why journal_datalist_lock is global and not per-journal.
* We cannot get back to this buffer's journal pointer without locking
* out journal_clean_data_list() in some manner.
*
* One could use journal_datalist_lock to get unracy access to a
* per-journal lock.
* *
* Called under jbd_lock_bh_state(bh) * Called under jbd_lock_bh_state(bh)
* *
* Returns non-zero iff we were able to free the journal_head. * Returns non-zero iff we were able to free the journal_head.
*/ */
static inline int __journal_try_to_free_buffer(struct buffer_head *bh) static inline int
__journal_try_to_free_buffer(journal_t *journal, struct buffer_head *bh)
{ {
struct journal_head *jh; struct journal_head *jh;
...@@ -1553,7 +1544,7 @@ static inline int __journal_try_to_free_buffer(struct buffer_head *bh) ...@@ -1553,7 +1544,7 @@ static inline int __journal_try_to_free_buffer(struct buffer_head *bh)
if (jh->b_next_transaction != 0) if (jh->b_next_transaction != 0)
goto out; goto out;
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
if (jh->b_transaction != 0 && jh->b_cp_transaction == 0) { if (jh->b_transaction != 0 && jh->b_cp_transaction == 0) {
if (jh->b_jlist == BJ_SyncData) { if (jh->b_jlist == BJ_SyncData) {
/* A written-back ordered data buffer */ /* A written-back ordered data buffer */
...@@ -1572,7 +1563,7 @@ static inline int __journal_try_to_free_buffer(struct buffer_head *bh) ...@@ -1572,7 +1563,7 @@ static inline int __journal_try_to_free_buffer(struct buffer_head *bh)
__brelse(bh); __brelse(bh);
} }
} }
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
return !buffer_jbd(bh); return !buffer_jbd(bh);
out: out:
...@@ -1627,7 +1618,8 @@ int journal_try_to_free_buffers(journal_t *journal, ...@@ -1627,7 +1618,8 @@ int journal_try_to_free_buffers(journal_t *journal,
bh = head; bh = head;
do { do {
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
if (buffer_jbd(bh) && !__journal_try_to_free_buffer(bh)) { if (buffer_jbd(bh) &&
!__journal_try_to_free_buffer(journal, bh)) {
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
goto busy; goto busy;
} }
...@@ -1646,7 +1638,7 @@ int journal_try_to_free_buffers(journal_t *journal, ...@@ -1646,7 +1638,7 @@ int journal_try_to_free_buffers(journal_t *journal,
* release it. * release it.
* Returns non-zero if JBD no longer has an interest in the buffer. * Returns non-zero if JBD no longer has an interest in the buffer.
* *
* Called under journal_datalist_lock. * Called under j_list_lock.
* *
* Called under jbd_lock_bh_state(bh). * Called under jbd_lock_bh_state(bh).
*/ */
...@@ -1727,16 +1719,17 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh) ...@@ -1727,16 +1719,17 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh)
BUFFER_TRACE(bh, "entry"); BUFFER_TRACE(bh, "entry");
/* It is safe to proceed here without the /*
* journal_datalist_spinlock because the buffers cannot be * It is safe to proceed here without the j_list_lock because the
* stolen by try_to_free_buffers as long as we are holding the * buffers cannot be stolen by try_to_free_buffers as long as we are
* page lock. --sct */ * holding the page lock. --sct
*/
if (!buffer_jbd(bh)) if (!buffer_jbd(bh))
goto zap_buffer_unlocked; goto zap_buffer_unlocked;
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
jh = bh2jh(bh); jh = bh2jh(bh);
transaction = jh->b_transaction; transaction = jh->b_transaction;
if (transaction == NULL) { if (transaction == NULL) {
...@@ -1765,7 +1758,7 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh) ...@@ -1765,7 +1758,7 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh)
JBUFFER_TRACE(jh, "checkpointed: add to BJ_Forget"); JBUFFER_TRACE(jh, "checkpointed: add to BJ_Forget");
ret = __dispose_buffer(jh, ret = __dispose_buffer(jh,
journal->j_running_transaction); journal->j_running_transaction);
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
return ret; return ret;
} else { } else {
...@@ -1777,7 +1770,7 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh) ...@@ -1777,7 +1770,7 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh)
JBUFFER_TRACE(jh, "give to committing trans"); JBUFFER_TRACE(jh, "give to committing trans");
ret = __dispose_buffer(jh, ret = __dispose_buffer(jh,
journal->j_committing_transaction); journal->j_committing_transaction);
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
return ret; return ret;
} else { } else {
...@@ -1799,7 +1792,7 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh) ...@@ -1799,7 +1792,7 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh)
journal->j_running_transaction); journal->j_running_transaction);
jh->b_next_transaction = NULL; jh->b_next_transaction = NULL;
} }
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
return 0; return 0;
} else { } else {
...@@ -1814,7 +1807,7 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh) ...@@ -1814,7 +1807,7 @@ static int journal_unmap_buffer(journal_t *journal, struct buffer_head *bh)
} }
zap_buffer: zap_buffer:
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
zap_buffer_unlocked: zap_buffer_unlocked:
clear_buffer_dirty(bh); clear_buffer_dirty(bh);
...@@ -1891,7 +1884,7 @@ void __journal_file_buffer(struct journal_head *jh, ...@@ -1891,7 +1884,7 @@ void __journal_file_buffer(struct journal_head *jh,
int was_dirty = 0; int was_dirty = 0;
struct buffer_head *bh = jh2bh(jh); struct buffer_head *bh = jh2bh(jh);
assert_spin_locked(&journal_datalist_lock); assert_spin_locked(&transaction->t_journal->j_list_lock);
#ifdef __SMP__ #ifdef __SMP__
J_ASSERT (current->lock_depth >= 0); J_ASSERT (current->lock_depth >= 0);
...@@ -1959,9 +1952,9 @@ void journal_file_buffer(struct journal_head *jh, ...@@ -1959,9 +1952,9 @@ void journal_file_buffer(struct journal_head *jh,
transaction_t *transaction, int jlist) transaction_t *transaction, int jlist)
{ {
jbd_lock_bh_state(jh2bh(jh)); jbd_lock_bh_state(jh2bh(jh));
spin_lock(&journal_datalist_lock); spin_lock(&transaction->t_journal->j_list_lock);
__journal_file_buffer(jh, transaction, jlist); __journal_file_buffer(jh, transaction, jlist);
spin_unlock(&journal_datalist_lock); spin_unlock(&transaction->t_journal->j_list_lock);
jbd_unlock_bh_state(jh2bh(jh)); jbd_unlock_bh_state(jh2bh(jh));
} }
...@@ -1971,7 +1964,7 @@ void journal_file_buffer(struct journal_head *jh, ...@@ -1971,7 +1964,7 @@ void journal_file_buffer(struct journal_head *jh,
* already started to be used by a subsequent transaction, refile the * already started to be used by a subsequent transaction, refile the
* buffer on that transaction's metadata list. * buffer on that transaction's metadata list.
* *
* Called under journal_datalist_lock * Called under journal->j_list_lock
* *
* Called under jbd_lock_bh_state(jh2bh(jh)) * Called under jbd_lock_bh_state(jh2bh(jh))
*/ */
...@@ -1980,7 +1973,8 @@ void __journal_refile_buffer(struct journal_head *jh) ...@@ -1980,7 +1973,8 @@ void __journal_refile_buffer(struct journal_head *jh)
int was_dirty; int was_dirty;
struct buffer_head *bh = jh2bh(jh); struct buffer_head *bh = jh2bh(jh);
assert_spin_locked(&journal_datalist_lock); if (jh->b_transaction)
assert_spin_locked(&jh->b_transaction->t_journal->j_list_lock);
/* If the buffer is now unused, just drop it. */ /* If the buffer is now unused, just drop it. */
if (jh->b_next_transaction == NULL) { if (jh->b_next_transaction == NULL) {
...@@ -2019,17 +2013,17 @@ void __journal_refile_buffer(struct journal_head *jh) ...@@ -2019,17 +2013,17 @@ void __journal_refile_buffer(struct journal_head *jh)
* *
* *** The journal_head may be freed by this call! *** * *** The journal_head may be freed by this call! ***
*/ */
void journal_refile_buffer(struct journal_head *jh) void journal_refile_buffer(journal_t *journal, struct journal_head *jh)
{ {
struct buffer_head *bh = jh2bh(jh); struct buffer_head *bh = jh2bh(jh);
jbd_lock_bh_state(bh); jbd_lock_bh_state(bh);
spin_lock(&journal_datalist_lock); spin_lock(&journal->j_list_lock);
__journal_refile_buffer(jh); __journal_refile_buffer(jh);
jbd_unlock_bh_state(bh); jbd_unlock_bh_state(bh);
journal_remove_journal_head(bh); journal_remove_journal_head(bh);
spin_unlock(&journal_datalist_lock); spin_unlock(&journal->j_list_lock);
__brelse(bh); __brelse(bh);
} }
include/linux/jbd.h
View file @ 0a63cac6
...@@ -836,10 +836,10 @@ struct journal_s ...@@ -836,10 +836,10 @@ struct journal_s
*/ */
/* Filing buffers */ /* Filing buffers */
extern void journal_unfile_buffer(journal_t *, struct journal_head *);
extern void __journal_unfile_buffer(struct journal_head *); extern void __journal_unfile_buffer(struct journal_head *);
extern void journal_unfile_buffer(struct journal_head *);
extern void __journal_refile_buffer(struct journal_head *); extern void __journal_refile_buffer(struct journal_head *);
extern void journal_refile_buffer(struct journal_head *); extern void journal_refile_buffer(journal_t *, struct journal_head *);
extern void __journal_file_buffer(struct journal_head *, transaction_t *, int); extern void __journal_file_buffer(struct journal_head *, transaction_t *, int);
extern void __journal_free_buffer(struct journal_head *bh); extern void __journal_free_buffer(struct journal_head *bh);
extern void journal_file_buffer(struct journal_head *, transaction_t *, int); extern void journal_file_buffer(struct journal_head *, transaction_t *, int);
...@@ -854,10 +854,8 @@ extern void journal_commit_transaction(journal_t *); ...@@ -854,10 +854,8 @@ extern void journal_commit_transaction(journal_t *);
/* Checkpoint list management */ /* Checkpoint list management */
int __journal_clean_checkpoint_list(journal_t *journal); int __journal_clean_checkpoint_list(journal_t *journal);
extern void journal_remove_checkpoint(struct journal_head *); void __journal_remove_checkpoint(struct journal_head *);
extern void __journal_remove_checkpoint(struct journal_head *); void __journal_insert_checkpoint(struct journal_head *, transaction_t *);
extern void journal_insert_checkpoint(struct journal_head *, transaction_t *);
extern void __journal_insert_checkpoint(struct journal_head *,transaction_t *);
/* Buffer IO */ /* Buffer IO */
extern int extern int
...@@ -1017,9 +1015,6 @@ extern void log_wait_for_space(journal_t *, int nblocks); ...@@ -1017,9 +1015,6 @@ extern void log_wait_for_space(journal_t *, int nblocks);
extern void __journal_drop_transaction(journal_t *, transaction_t *); extern void __journal_drop_transaction(journal_t *, transaction_t *);
extern int cleanup_journal_tail(journal_t *); extern int cleanup_journal_tail(journal_t *);
/* Reduce journal memory usage by flushing */
extern void shrink_journal_memory(void);
/* Debugging code only: */ /* Debugging code only: */
#define jbd_ENOSYS() \ #define jbd_ENOSYS() \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7