Commit a6f5ccdf authored by Linus Torvalds's avatar Linus Torvalds

Merge http://jfs.bkbits.net/linux-2.5

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 2c707d9b 5d888402
...@@ -97,7 +97,7 @@ DECLARE_WAIT_QUEUE_HEAD(jfs_IO_thread_wait); ...@@ -97,7 +97,7 @@ DECLARE_WAIT_QUEUE_HEAD(jfs_IO_thread_wait);
#define LOGGC_LOCK_INIT(log) spin_lock_init(&(log)->gclock) #define LOGGC_LOCK_INIT(log) spin_lock_init(&(log)->gclock)
#define LOGGC_LOCK(log) spin_lock_irq(&(log)->gclock) #define LOGGC_LOCK(log) spin_lock_irq(&(log)->gclock)
#define LOGGC_UNLOCK(log) spin_unlock_irq(&(log)->gclock) #define LOGGC_UNLOCK(log) spin_unlock_irq(&(log)->gclock)
#define LOGGC_WAKEUP(tblk) wake_up(&(tblk)->gcwait) #define LOGGC_WAKEUP(tblk) wake_up_all(&(tblk)->gcwait)
/* /*
* log sync serialization (per log) * log sync serialization (per log)
...@@ -511,7 +511,6 @@ lmWriteRecord(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd, ...@@ -511,7 +511,6 @@ lmWriteRecord(struct jfs_log * log, struct tblock * tblk, struct lrd * lrd,
tblk->bp = log->bp; tblk->bp = log->bp;
tblk->pn = log->page; tblk->pn = log->page;
tblk->eor = log->eor; tblk->eor = log->eor;
init_waitqueue_head(&tblk->gcwait);
/* enqueue transaction to commit queue */ /* enqueue transaction to commit queue */
tblk->cqnext = NULL; tblk->cqnext = NULL;
...@@ -831,6 +830,12 @@ void lmPostGC(struct lbuf * bp) ...@@ -831,6 +830,12 @@ void lmPostGC(struct lbuf * bp)
tblk->flag &= ~tblkGC_QUEUE; tblk->flag &= ~tblkGC_QUEUE;
tblk->cqnext = 0; tblk->cqnext = 0;
if (tblk == log->flush_tblk) {
/* we can stop flushing the log now */
clear_bit(log_FLUSH, &log->flag);
log->flush_tblk = NULL;
}
jfs_info("lmPostGC: tblk = 0x%p, flag = 0x%x", tblk, jfs_info("lmPostGC: tblk = 0x%p, flag = 0x%x", tblk,
tblk->flag); tblk->flag);
...@@ -843,11 +848,11 @@ void lmPostGC(struct lbuf * bp) ...@@ -843,11 +848,11 @@ void lmPostGC(struct lbuf * bp)
/* state transition: COMMIT -> COMMITTED */ /* state transition: COMMIT -> COMMITTED */
tblk->flag |= tblkGC_COMMITTED; tblk->flag |= tblkGC_COMMITTED;
if (tblk->flag & tblkGC_READY) { if (tblk->flag & tblkGC_READY)
log->gcrtc--; log->gcrtc--;
LOGGC_WAKEUP(tblk); LOGGC_WAKEUP(tblk);
} }
}
/* was page full before pageout ? /* was page full before pageout ?
* (and this is the last tblk bound with the page) * (and this is the last tblk bound with the page)
...@@ -892,6 +897,7 @@ void lmPostGC(struct lbuf * bp) ...@@ -892,6 +897,7 @@ void lmPostGC(struct lbuf * bp)
else { else {
log->cflag &= ~logGC_PAGEOUT; log->cflag &= ~logGC_PAGEOUT;
clear_bit(log_FLUSH, &log->flag); clear_bit(log_FLUSH, &log->flag);
WARN_ON(log->flush_tblk);
} }
//LOGGC_UNLOCK(log); //LOGGC_UNLOCK(log);
...@@ -1307,7 +1313,8 @@ int lmLogInit(struct jfs_log * log) ...@@ -1307,7 +1313,8 @@ int lmLogInit(struct jfs_log * log)
INIT_LIST_HEAD(&log->synclist); INIT_LIST_HEAD(&log->synclist);
log->cqueue.head = log->cqueue.tail = 0; log->cqueue.head = log->cqueue.tail = NULL;
log->flush_tblk = NULL;
log->count = 0; log->count = 0;
...@@ -1395,38 +1402,78 @@ int lmLogClose(struct super_block *sb, struct jfs_log * log) ...@@ -1395,38 +1402,78 @@ int lmLogClose(struct super_block *sb, struct jfs_log * log)
* *
* FUNCTION: initiate write of any outstanding transactions to the journal * FUNCTION: initiate write of any outstanding transactions to the journal
* and optionally wait until they are all written to disk * and optionally wait until they are all written to disk
*
* wait == 0 flush until latest txn is committed, don't wait
* wait == 1 flush until latest txn is committed, wait
* wait > 1 flush until all txn's are complete, wait
*/ */
void jfs_flush_journal(struct jfs_log *log, int wait) void jfs_flush_journal(struct jfs_log *log, int wait)
{ {
int i; int i;
struct tblock *target;
jfs_info("jfs_flush_journal: log:0x%p wait=%d", log, wait); jfs_info("jfs_flush_journal: log:0x%p wait=%d", log, wait);
LOGGC_LOCK(log);
target = log->cqueue.head;
if (target) {
/* /*
* This ensures that we will keep writing to the journal as long * This ensures that we will keep writing to the journal as long
* as there are unwritten commit records * as there are unwritten commit records
*/ */
if (test_bit(log_FLUSH, &log->flag)) {
/*
* We're already flushing.
* if flush_tblk is NULL, we are flushing everything,
* so leave it that way. Otherwise, update it to the
* latest transaction
*/
if (log->flush_tblk)
log->flush_tblk = target;
} else {
/* Only flush until latest transaction is committed */
log->flush_tblk = target;
set_bit(log_FLUSH, &log->flag); set_bit(log_FLUSH, &log->flag);
/* /*
* Initiate I/O on outstanding transactions * Initiate I/O on outstanding transactions
*/ */
LOGGC_LOCK(log); if (!(log->cflag & logGC_PAGEOUT)) {
if (log->cqueue.head && !(log->cflag & logGC_PAGEOUT)) {
log->cflag |= logGC_PAGEOUT; log->cflag |= logGC_PAGEOUT;
lmGCwrite(log, 0); lmGCwrite(log, 0);
} }
}
}
if ((wait > 1) || test_bit(log_SYNCBARRIER, &log->flag)) {
/* Flush until all activity complete */
set_bit(log_FLUSH, &log->flag);
log->flush_tblk = NULL;
}
if (wait && target && !(target->flag & tblkGC_COMMITTED)) {
DECLARE_WAITQUEUE(__wait, current);
add_wait_queue(&target->gcwait, &__wait);
set_current_state(TASK_UNINTERRUPTIBLE);
LOGGC_UNLOCK(log);
schedule();
current->state = TASK_RUNNING;
LOGGC_LOCK(log);
remove_wait_queue(&target->gcwait, &__wait);
}
LOGGC_UNLOCK(log); LOGGC_UNLOCK(log);
if (!wait) if (wait < 2)
return; return;
if (log->cqueue.head || !list_empty(&log->synclist)) {
/* /*
* If there was very recent activity, we may need to wait * If there was recent activity, we may need to wait
* for the lazycommit thread to catch up * for the lazycommit thread to catch up
*/ */
if (log->cqueue.head || !list_empty(&log->synclist)) {
for (i = 0; i < 800; i++) { /* Too much? */ for (i = 0; i < 800; i++) { /* Too much? */
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
schedule_timeout(HZ / 4); schedule_timeout(HZ / 4);
...@@ -1437,7 +1484,6 @@ void jfs_flush_journal(struct jfs_log *log, int wait) ...@@ -1437,7 +1484,6 @@ void jfs_flush_journal(struct jfs_log *log, int wait)
} }
assert(log->cqueue.head == NULL); assert(log->cqueue.head == NULL);
assert(list_empty(&log->synclist)); assert(list_empty(&log->synclist));
clear_bit(log_FLUSH, &log->flag); clear_bit(log_FLUSH, &log->flag);
} }
...@@ -1467,7 +1513,7 @@ int lmLogShutdown(struct jfs_log * log) ...@@ -1467,7 +1513,7 @@ int lmLogShutdown(struct jfs_log * log)
jfs_info("lmLogShutdown: log:0x%p", log); jfs_info("lmLogShutdown: log:0x%p", log);
jfs_flush_journal(log, 1); jfs_flush_journal(log, 2);
/* /*
* We need to make sure all of the "written" metapages * We need to make sure all of the "written" metapages
......
...@@ -403,6 +403,7 @@ struct jfs_log { ...@@ -403,6 +403,7 @@ struct jfs_log {
struct tblock *head; struct tblock *head;
struct tblock *tail; struct tblock *tail;
} cqueue; } cqueue;
struct tblock *flush_tblk; /* tblk we're waiting on for flush */
int gcrtc; /* 4: GC_READY transaction count */ int gcrtc; /* 4: GC_READY transaction count */
struct tblock *gclrt; /* 4: latest GC_READY transaction */ struct tblock *gclrt; /* 4: latest GC_READY transaction */
spinlock_t gclock; /* 4: group commit lock */ spinlock_t gclock; /* 4: group commit lock */
......
...@@ -2741,8 +2741,7 @@ void txLazyCommit(struct tblock * tblk) ...@@ -2741,8 +2741,7 @@ void txLazyCommit(struct tblock * tblk)
if (tblk->flag & tblkGC_READY) if (tblk->flag & tblkGC_READY)
log->gcrtc--; log->gcrtc--;
if (tblk->flag & tblkGC_READY) wake_up_all(&tblk->gcwait); // LOGGC_WAKEUP
wake_up(&tblk->gcwait); // LOGGC_WAKEUP
/* /*
* Can't release log->gclock until we've tested tblk->flag * Can't release log->gclock until we've tested tblk->flag
......
...@@ -69,7 +69,7 @@ int jfs_umount(struct super_block *sb) ...@@ -69,7 +69,7 @@ int jfs_umount(struct super_block *sb)
/* /*
* Wait for outstanding transactions to be written to log: * Wait for outstanding transactions to be written to log:
*/ */
jfs_flush_journal(log, 1); jfs_flush_journal(log, 2);
/* /*
* close fileset inode allocation map (aka fileset inode) * close fileset inode allocation map (aka fileset inode)
...@@ -149,7 +149,7 @@ int jfs_umount_rw(struct super_block *sb) ...@@ -149,7 +149,7 @@ int jfs_umount_rw(struct super_block *sb)
* *
* remove file system from log active file system list. * remove file system from log active file system list.
*/ */
jfs_flush_journal(log, 1); jfs_flush_journal(log, 2);
/* /*
* Make sure all metadata makes it to disk * Make sure all metadata makes it to disk
......
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