JFS: fix up more merge issues

The BK merging was a little too smart for the conflicting changes.
Add back what we lost with the last changeset.

fs/jfs/jfs_umount.c

@@ -113,8 +113,8 @@ 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_fdatawrite(bdev_mapping);
+	filemap_fdatawait(bdev_mapping);
 
 	/*
 	 * ensure all file system file pages are propagated to their
@@ -168,6 +168,7 @@ int jfs_umount_rw(struct super_block *sb)
 	 * disk.
 	 */
 	filemap_fdatawrite(bdev_mapping);
+	filemap_fdatawait(bdev_mapping);
 
 	updateSuper(sb, FM_CLEAN);
 	sbi->log = NULL;