JFS: Make sure special inode data is written after journal is flushed

This patch makes sure that data that we tried to flush before the journal
was completely written actually gets pushed to disk.

To avoid duplicating code, moved common code to write_special_inodes().

Signed-off-by: Dave Kleikamp <shaggy@linux.vnet.ibm.com>

2 files changed, 17 insertions, 19 deletions

diff --git a/fs/jfs/jfs_logmgr.c b/fs/jfs/jfs_logmgr.c
index 15a3974cdeeb..2370716d57ad 100644
--- a/fs/jfs/jfs_logmgr.c
+++ b/fs/jfs/jfs_logmgr.c
@@ -208,6 +208,17 @@ static struct lmStat {
 } lmStat;
 #endif
 
+static void write_special_inodes(struct jfs_log *log,
+                                 int (*writer)(struct address_space *))
+{
+        struct jfs_sb_info *sbi;
+
+        list_for_each_entry(sbi, &log->sb_list, log_list) {
+                writer(sbi->ipbmap->i_mapping);
+                writer(sbi->ipimap->i_mapping);
+                writer(sbi->direct_inode->i_mapping);
+        }
+}
 
 /*
  * NAME:        lmLog()
@@ -935,22 +946,13 @@ static int lmLogSync(struct jfs_log * log, int hard_sync)
         struct lrd lrd;
         int lsn;
         struct logsyncblk *lp;
-        struct jfs_sb_info *sbi;
         unsigned long flags;
 
         /* push dirty metapages out to disk */
         if (hard_sync)
-                list_for_each_entry(sbi, &log->sb_list, log_list) {
-                        filemap_fdatawrite(sbi->ipbmap->i_mapping);
-                        filemap_fdatawrite(sbi->ipimap->i_mapping);
-                        filemap_fdatawrite(sbi->direct_inode->i_mapping);
-                }
+                write_special_inodes(log, filemap_fdatawrite);
         else
-                list_for_each_entry(sbi, &log->sb_list, log_list) {
-                        filemap_flush(sbi->ipbmap->i_mapping);
-                        filemap_flush(sbi->ipimap->i_mapping);
-                        filemap_flush(sbi->direct_inode->i_mapping);
-                }
+                write_special_inodes(log, filemap_flush);
 
         /*
          *      forward syncpt
@@ -1536,7 +1538,6 @@ void jfs_flush_journal(struct jfs_log *log, int wait)
 {
         int i;
         struct tblock *target = NULL;
-        struct jfs_sb_info *sbi;
 
         /* jfs_write_inode may call us during read-only mount */
         if (!log)
@@ -1598,11 +1599,7 @@ void jfs_flush_journal(struct jfs_log *log, int wait)
         if (wait < 2)
                 return;
 
-        list_for_each_entry(sbi, &log->sb_list, log_list) {
-                filemap_fdatawrite(sbi->ipbmap->i_mapping);
-                filemap_fdatawrite(sbi->ipimap->i_mapping);
-                filemap_fdatawrite(sbi->direct_inode->i_mapping);
-        }
+        write_special_inodes(log, filemap_fdatawrite);
 
         /*
          * If there was recent activity, we may need to wait
@@ -1611,6 +1608,7 @@ void jfs_flush_journal(struct jfs_log *log, int wait)
         if ((!list_empty(&log->cqueue)) || !list_empty(&log->synclist)) {
                 for (i = 0; i < 200; i++) {     /* Too much? */
                         msleep(250);
+                        write_special_inodes(log, filemap_fdatawrite);
                         if (list_empty(&log->cqueue) &&
                             list_empty(&log->synclist))
                                 break;
diff --git a/fs/jfs/jfs_umount.c b/fs/jfs/jfs_umount.c
index 7971f37534a3..adcf92d3b603 100644
--- a/fs/jfs/jfs_umount.c
+++ b/fs/jfs/jfs_umount.c
@@ -68,7 +68,7 @@ int jfs_umount(struct super_block *sb)
                 /*
                  * Wait for outstanding transactions to be written to log:
                  */
-                jfs_flush_journal(log, 2);
+                jfs_flush_journal(log, 1);
 
         /*
          * close fileset inode allocation map (aka fileset inode)
@@ -146,7 +146,7 @@ int jfs_umount_rw(struct super_block *sb)
          *
          * remove file system from log active file system list.
          */
-        jfs_flush_journal(log, 2);
+        jfs_flush_journal(log, 1);
 
         /*
          * Make sure all metadata makes it to disk