vserver 1.9.5.x5

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

diff --git a/fs/jfs/jfs_mount.c b/fs/jfs/jfs_mount.c
index 3de7db1..c535ffd 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);
 
@@ -327,7 +324,7 @@ static int chkSuper(struct super_block *sb)
         */
        /* validate fs signature */
        if (strncmp(j_sb->s_magic, JFS_MAGIC, 4) ||
-           j_sb->s_version > cpu_to_le32(JFS_VERSION)) {
+           le32_to_cpu(j_sb->s_version) > JFS_VERSION) {
                rc = -EINVAL;
                goto out;
        }