vserver 1.9.3

[linux-2.6.git] / fs / jfs / jfs_mount.c

diff --git a/fs/jfs/jfs_mount.c b/fs/jfs/jfs_mount.c
index 5cdcaac..aa87182 100644 (file)
--- a/fs/jfs/jfs_mount.c
+++ b/fs/jfs/jfs_mount.c
@@ -166,7 +166,7 @@ int jfs_mount(struct super_block *sb)
                }
        } else
                /* Secondary aggregate inode table is not valid */
-               sbi->ipaimap2 = 0;
+               sbi->ipaimap2 = NULL;
 
        /*
         *      mount (the only/single) fileset
@@ -197,9 +197,6 @@ int jfs_mount(struct super_block *sb)
        /*
         *      unwind on error
         */
-//errout42: /* close fileset inode allocation map */
-       diUnmount(ipimap, 1);
-
       errout41:                /* close fileset inode allocation map inode */
        diFreeSpecial(ipimap);
 
@@ -288,6 +285,11 @@ int jfs_mount_rw(struct super_block *sb, int remount)
         */
        logMOUNT(sb);
 
+       /*
+        * Set page cache allocation policy
+        */
+       mapping_set_gfp_mask(sb->s_bdev->bd_inode->i_mapping, GFP_NOFS);
+
        return rc;
 }