6 files changed, 9 insertions, 18 deletions

diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c
index 68000a50ceb6..2967b7393415 100644
--- a/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@ -302,8 +302,7 @@ int dbSync(struct inode *ipbmap)
         /*
          * write out dirty pages of bmap
          */
-        filemap_fdatawrite(ipbmap->i_mapping);
-        filemap_fdatawait(ipbmap->i_mapping);
+        filemap_write_and_wait(ipbmap->i_mapping);
 
         diWriteSpecial(ipbmap, 0);
 
diff --git a/fs/jfs/jfs_imap.c b/fs/jfs/jfs_imap.c
index 28201b194f53..31b4aa13dd4b 100644
--- a/fs/jfs/jfs_imap.c
+++ b/fs/jfs/jfs_imap.c
@@ -265,8 +265,7 @@ int diSync(struct inode *ipimap)
         /*
          * write out dirty pages of imap
          */
-        filemap_fdatawrite(ipimap->i_mapping);
-        filemap_fdatawait(ipimap->i_mapping);
+        filemap_write_and_wait(ipimap->i_mapping);
 
         diWriteSpecial(ipimap, 0);
 
@@ -565,8 +564,7 @@ void diFreeSpecial(struct inode *ip)
                 jfs_err("diFreeSpecial called with NULL ip!");
                 return;
         }
-        filemap_fdatawrite(ip->i_mapping);
-        filemap_fdatawait(ip->i_mapping);
+        filemap_write_and_wait(ip->i_mapping);
         truncate_inode_pages(ip->i_mapping, 0);
         iput(ip);
 }
diff --git a/fs/jfs/jfs_txnmgr.c b/fs/jfs/jfs_txnmgr.c
index b660c93c92de..2ddb6b892bcf 100644
--- a/fs/jfs/jfs_txnmgr.c
+++ b/fs/jfs/jfs_txnmgr.c
@@ -1231,10 +1231,8 @@ int txCommit(tid_t tid,		/* transaction identifier */
                  * when we don't need to worry about it at all.
                  *
                  * if ((!S_ISDIR(ip->i_mode))
-                 *    && (tblk->flag & COMMIT_DELETE) == 0) {
-                 *      filemap_fdatawrite(ip->i_mapping);
-                 *      filemap_fdatawait(ip->i_mapping);
-                 * }
+                 *    && (tblk->flag & COMMIT_DELETE) == 0)
+                 *      filemap_write_and_wait(ip->i_mapping);
                  */
 
                 /*
diff --git a/fs/jfs/jfs_umount.c b/fs/jfs/jfs_umount.c
index 5cf91785b541..21eaf7ac0fcb 100644
--- a/fs/jfs/jfs_umount.c
+++ b/fs/jfs/jfs_umount.c
@@ -108,8 +108,7 @@ int jfs_umount(struct super_block *sb)
          * Make sure all metadata makes it to disk before we mark
          * the superblock as clean
          */
-        filemap_fdatawrite(sbi->direct_inode->i_mapping);
-        filemap_fdatawait(sbi->direct_inode->i_mapping);
+        filemap_write_and_wait(sbi->direct_inode->i_mapping);
 
         /*
          * ensure all file system file pages are propagated to their
@@ -161,8 +160,7 @@ int jfs_umount_rw(struct super_block *sb)
          * mark the superblock clean before everything is flushed to
          * disk.
          */
-        filemap_fdatawrite(sbi->direct_inode->i_mapping);
-        filemap_fdatawait(sbi->direct_inode->i_mapping);
+        filemap_write_and_wait(sbi->direct_inode->i_mapping);
 
         updateSuper(sb, FM_CLEAN);
 
diff --git a/fs/jfs/resize.c b/fs/jfs/resize.c
index c6dc254d3253..45180361871c 100644
--- a/fs/jfs/resize.c
+++ b/fs/jfs/resize.c
@@ -376,8 +376,7 @@ int jfs_extendfs(struct super_block *sb, s64 newLVSize, int newLogSize)
          * by txCommit();
          */
         filemap_fdatawait(ipbmap->i_mapping);
-        filemap_fdatawrite(ipbmap->i_mapping);
-        filemap_fdatawait(ipbmap->i_mapping);
+        filemap_write_and_wait(ipbmap->i_mapping);
         diWriteSpecial(ipbmap, 0);
 
         newPage = nPages;       /* first new page number */
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 4226af3ea91b..8d31f1336431 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -502,8 +502,7 @@ out_no_rw:
                 jfs_err("jfs_umount failed with return code %d", rc);
         }
 out_mount_failed:
-        filemap_fdatawrite(sbi->direct_inode->i_mapping);
-        filemap_fdatawait(sbi->direct_inode->i_mapping);
+        filemap_write_and_wait(sbi->direct_inode->i_mapping);
         truncate_inode_pages(sbi->direct_inode->i_mapping, 0);
         make_bad_inode(sbi->direct_inode);
         iput(sbi->direct_inode);