*
* Called with j_list_lock held.
*/
-
-static void __buffer_unlink_first(struct journal_head *jh)
+static inline void __buffer_unlink_first(struct journal_head *jh)
{
- transaction_t *transaction;
-
- transaction = jh->b_cp_transaction;
+ transaction_t *transaction = jh->b_cp_transaction;
jh->b_cpnext->b_cpprev = jh->b_cpprev;
jh->b_cpprev->b_cpnext = jh->b_cpnext;
*
* Called with j_list_lock held.
*/
-
static inline void __buffer_unlink(struct journal_head *jh)
{
- transaction_t *transaction;
-
- transaction = jh->b_cp_transaction;
+ transaction_t *transaction = jh->b_cp_transaction;
__buffer_unlink_first(jh);
if (transaction->t_checkpoint_io_list == jh) {
*
* Called with j_list_lock held
*/
-
static inline void __buffer_relink_io(struct journal_head *jh)
{
- transaction_t *transaction;
+ transaction_t *transaction = jh->b_cp_transaction;
- transaction = jh->b_cp_transaction;
__buffer_unlink_first(jh);
if (!transaction->t_checkpoint_io_list) {
if (journal->j_flags & JFS_ABORT)
return;
spin_unlock(&journal->j_state_lock);
- down(&journal->j_checkpoint_sem);
+ mutex_lock(&journal->j_checkpoint_mutex);
/*
* Test again, another process may have checkpointed while we
log_do_checkpoint(journal);
spin_lock(&journal->j_state_lock);
}
- up(&journal->j_checkpoint_sem);
+ mutex_unlock(&journal->j_checkpoint_mutex);
}
}
*
* Called with j_list_lock held.
*/
-
static void __wait_cp_io(journal_t *journal, transaction_t *transaction)
{
struct journal_head *jh;
this_tid = transaction->t_tid;
restart:
- /* Didn't somebody clean up the transaction in the meanwhile */
+ /* Did somebody clean up the transaction in the meanwhile? */
if (journal->j_checkpoint_transactions != transaction ||
- transaction->t_tid != this_tid)
+ transaction->t_tid != this_tid)
return;
while (!released && transaction->t_checkpoint_io_list) {
jh = transaction->t_checkpoint_io_list;
*/
released = __journal_remove_checkpoint(jh);
jbd_unlock_bh_state(bh);
+ journal_remove_journal_head(bh);
+ __brelse(bh);
}
}
int ret = 0;
if (buffer_locked(bh)) {
- get_bh(bh);
+ atomic_inc(&bh->b_count);
spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh);
wait_on_buffer(bh);
/* the journal_head may have gone by now */
BUFFER_TRACE(bh, "brelse");
- put_bh(bh);
+ __brelse(bh);
ret = 1;
- }
- else if (jh->b_transaction != NULL) {
+ } else if (jh->b_transaction != NULL) {
transaction_t *t = jh->b_transaction;
tid_t tid = t->t_tid;
log_start_commit(journal, tid);
log_wait_commit(journal, tid);
ret = 1;
- }
- else if (!buffer_dirty(bh)) {
+ } else if (!buffer_dirty(bh)) {
J_ASSERT_JH(jh, !buffer_jbddirty(bh));
BUFFER_TRACE(bh, "remove from checkpoint");
__journal_remove_checkpoint(jh);
spin_unlock(&journal->j_list_lock);
jbd_unlock_bh_state(bh);
journal_remove_journal_head(bh);
- put_bh(bh);
+ __brelse(bh);
ret = 1;
- }
- else {
+ } else {
/*
* Important: we are about to write the buffer, and
* possibly block, while still holding the journal lock.
* done (maybe it's a new transaction, but it fell at the same
* address).
*/
- if (journal->j_checkpoint_transactions == transaction ||
+ if (journal->j_checkpoint_transactions == transaction &&
transaction->t_tid == this_tid) {
int batch_count = 0;
struct buffer_head *bhs[NR_BATCH];
retry = 1;
break;
}
- retry = __process_buffer(journal, jh, bhs,
- &batch_count);
- if (!retry &&
- lock_need_resched(&journal->j_list_lock)) {
+ retry = __process_buffer(journal, jh, bhs,&batch_count);
+ if (!retry && lock_need_resched(&journal->j_list_lock)){
spin_unlock(&journal->j_list_lock);
retry = 1;
break;
}
/*
* Now we have cleaned up the first transaction's checkpoint
- * list. Let's clean up the second one.
+ * list. Let's clean up the second one
*/
__wait_cp_io(journal, transaction);
}
}
}
/*
- * This function only frees up some memory if possible so we
- * dont have an obligation to finish processing. Bail out if
- * preemption requested:
+ * This function only frees up some memory
+ * if possible so we dont have an obligation
+ * to finish processing. Bail out if preemption
+ * requested:
*/
if (need_resched())
return freed;
int __journal_clean_checkpoint_list(journal_t *journal)
{
transaction_t *transaction, *last_transaction, *next_transaction;
- int ret = 0, released;
+ int ret = 0;
+ int released;
transaction = journal->j_checkpoint_transactions;
if (!transaction)
next_transaction = transaction->t_cpnext;
ret += journal_clean_one_cp_list(transaction->
t_checkpoint_list, &released);
+ /*
+ * This function only frees up some memory if possible so we
+ * dont have an obligation to finish processing. Bail out if
+ * preemption requested:
+ */
if (need_resched())
goto out;
if (released)