Commit 854f96ea authored by Dave Kleikamp's avatar Dave Kleikamp

Merge bk://linus.bkbits.net/linux-2.5

into hostme.bitkeeper.com:/ua/repos/j/jfs/linux-2.5
parents 706e5455 b0df1a7a
...@@ -2746,13 +2746,16 @@ void txLazyCommit(struct tblock * tblk) ...@@ -2746,13 +2746,16 @@ void txLazyCommit(struct tblock * tblk)
if (tblk->flag & tblkGC_READY) if (tblk->flag & tblkGC_READY)
wake_up(&tblk->gcwait); // LOGGC_WAKEUP wake_up(&tblk->gcwait); // LOGGC_WAKEUP
spin_unlock_irq(&log->gclock); // LOGGC_UNLOCK /*
* Can't release log->gclock until we've tested tblk->flag
*/
if (tblk->flag & tblkGC_LAZY) { if (tblk->flag & tblkGC_LAZY) {
spin_unlock_irq(&log->gclock); // LOGGC_UNLOCK
txUnlock(tblk); txUnlock(tblk);
tblk->flag &= ~tblkGC_LAZY; tblk->flag &= ~tblkGC_LAZY;
txEnd(tblk - TxBlock); /* Convert back to tid */ txEnd(tblk - TxBlock); /* Convert back to tid */
} } else
spin_unlock_irq(&log->gclock); // LOGGC_UNLOCK
jFYI(1, ("txLazyCommit: done: tblk = 0x%p\n", tblk)); jFYI(1, ("txLazyCommit: done: tblk = 0x%p\n", tblk));
} }
......
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