Merge with /home/shaggy/git/linus-clean/

diff --combined fs/jfs/jfs_dmap.c
index adb9f05,2967b73..038d8b7
--- 1/fs/jfs/jfs_dmap.c
--- 2/fs/jfs/jfs_dmap.c
+++ b/fs/jfs/jfs_dmap.c
@@@ -125,7 -125,7 +125,7 @@@ static int dbGetL2AGSize(s64 nblocks)
   * into the table, with the table elements yielding the maximum
   * binary buddy of free bits within the character.
   */
 -static s8 budtab[256] = {
 +static const s8 budtab[256] = {
        3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
        2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
        2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
@@@ -302,8 -302,7 +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);