summaryrefslogtreecommitdiffstats
path: root/fs/jfs/jfs_metapage.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 12:44:24 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 12:44:24 -0700
commit8caf89157d64f1eedba37113afb4b303b2b3e301 (patch)
treea72038508368f81e5b3f1b82ad14918df8c7be7a /fs/jfs/jfs_metapage.c
parentf12baeab9d65e2fe1b43b09b666f5efcb81b9369 (diff)
parent7038f1cbac899654cf0515e60dbe3e44d58271de (diff)
downloadlinux-8caf89157d64f1eedba37113afb4b303b2b3e301.tar.gz
linux-8caf89157d64f1eedba37113afb4b303b2b3e301.tar.bz2
linux-8caf89157d64f1eedba37113afb4b303b2b3e301.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy/jfs-2.6
Diffstat (limited to 'fs/jfs/jfs_metapage.c')
-rw-r--r--fs/jfs/jfs_metapage.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/jfs/jfs_metapage.c b/fs/jfs/jfs_metapage.c
index eeb37d70e650..26091a5f88d4 100644
--- a/fs/jfs/jfs_metapage.c
+++ b/fs/jfs/jfs_metapage.c
@@ -395,6 +395,12 @@ static int metapage_writepage(struct page *page, struct writeback_control *wbc)
if (mp->nohomeok && !test_bit(META_forcewrite, &mp->flag)) {
redirty = 1;
+ /*
+ * Make sure this page isn't blocked indefinitely.
+ * If the journal isn't undergoing I/O, push it
+ */
+ if (mp->log && !(mp->log->cflag & logGC_PAGEOUT))
+ jfs_flush_journal(mp->log, 0);
continue;
}