Commit 8cd4a904 authored by Dave Kleikamp's avatar Dave Kleikamp

Merge jfs@jfs.bkbits.net:linux-2.5

into shaggy.austin.ibm.com:/shaggy/bk/jfs-2.5
parents 2ec18910 11059034
...@@ -674,28 +674,29 @@ int lmGroupCommit(struct jfs_log * log, struct tblock * tblk) ...@@ -674,28 +674,29 @@ int lmGroupCommit(struct jfs_log * log, struct tblock * tblk)
} }
jfs_info("lmGroup Commit: tblk = 0x%p, gcrtc = %d", tblk, log->gcrtc); jfs_info("lmGroup Commit: tblk = 0x%p, gcrtc = %d", tblk, log->gcrtc);
if (tblk->xflag & COMMIT_LAZY) { if (tblk->xflag & COMMIT_LAZY)
/*
* Lazy transactions can leave now
*/
tblk->flag |= tblkGC_LAZY; tblk->flag |= tblkGC_LAZY;
LOGGC_UNLOCK(log);
return 0; if ((!(log->cflag & logGC_PAGEOUT)) && log->cqueue.head &&
} (!(tblk->xflag & COMMIT_LAZY) || test_bit(log_FLUSH, &log->flag))) {
/*
* group commit pageout in progress
*/
if ((!(log->cflag & logGC_PAGEOUT)) && log->cqueue.head) {
/* /*
* only transaction in the commit queue: * No pageout in progress
* *
* start one-transaction group commit as * start group commit as its group leader.
* its group leader.
*/ */
log->cflag |= logGC_PAGEOUT; log->cflag |= logGC_PAGEOUT;
lmGCwrite(log, 0); lmGCwrite(log, 0);
} }
if (tblk->xflag & COMMIT_LAZY) {
/*
* Lazy transactions can leave now
*/
LOGGC_UNLOCK(log);
return 0;
}
/* lmGCwrite gives up LOGGC_LOCK, check again */ /* lmGCwrite gives up LOGGC_LOCK, check again */
if (tblk->flag & tblkGC_COMMITTED) { if (tblk->flag & tblkGC_COMMITTED) {
...@@ -894,11 +895,8 @@ void lmPostGC(struct lbuf * bp) ...@@ -894,11 +895,8 @@ void lmPostGC(struct lbuf * bp)
* the first transaction entering group commit * the first transaction entering group commit
* will elect herself as new group leader. * will elect herself as new group leader.
*/ */
else { else
log->cflag &= ~logGC_PAGEOUT; log->cflag &= ~logGC_PAGEOUT;
clear_bit(log_FLUSH, &log->flag);
WARN_ON(log->flush_tblk);
}
//LOGGC_UNLOCK(log); //LOGGC_UNLOCK(log);
spin_unlock_irqrestore(&log->gclock, flags); spin_unlock_irqrestore(&log->gclock, flags);
......
...@@ -518,16 +518,17 @@ void txEnd(tid_t tid) ...@@ -518,16 +518,17 @@ void txEnd(tid_t tid)
/* /*
* mark the tblock not active * mark the tblock not active
*/ */
--log->active; if (--log->active == 0) {
clear_bit(log_FLUSH, &log->flag);
/* /*
* synchronize with logsync barrier * synchronize with logsync barrier
*/ */
if (test_bit(log_SYNCBARRIER, &log->flag) && log->active == 0) { if (test_bit(log_SYNCBARRIER, &log->flag)) {
/* forward log syncpt */ /* forward log syncpt */
/* lmSync(log); */ /* lmSync(log); */
jfs_info(" log barrier off: 0x%x", log->lsn); jfs_info("log barrier off: 0x%x", log->lsn);
/* enable new transactions start */ /* enable new transactions start */
clear_bit(log_SYNCBARRIER, &log->flag); clear_bit(log_SYNCBARRIER, &log->flag);
...@@ -535,6 +536,7 @@ void txEnd(tid_t tid) ...@@ -535,6 +536,7 @@ void txEnd(tid_t tid)
/* wakeup all waitors for logsync barrier */ /* wakeup all waitors for logsync barrier */
TXN_WAKEUP(&log->syncwait); TXN_WAKEUP(&log->syncwait);
} }
}
/* /*
* wakeup all waitors for a free tblock * wakeup all waitors for a free tblock
......
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