libext2fs: Always swab the MMP block on big-endian systems machines

[tools/e2fsprogs.git] / lib / ext2fs / i_block.c

diff --git a/lib/ext2fs/i_block.c b/lib/ext2fs/i_block.c
index 6e1b136..5ca57e4 100644 (file)
--- a/lib/ext2fs/i_block.c
+++ b/lib/ext2fs/i_block.c
@@ -4,11 +4,12 @@
  * Copyright (C) 2008 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -31,18 +32,20 @@ errcode_t ext2fs_iblk_add_blocks(ext2_filsys fs, struct ext2_inode *inode,
 {
        unsigned long long b = inode->i_blocks;
 
+       if (fs->super->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_HUGE_FILE)
+               b += ((long long) inode->osd2.linux2.l_i_blocks_hi) << 32;
+
        if (!(fs->super->s_feature_ro_compat &
              EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ||
            !(inode->i_flags & EXT4_HUGE_FILE_FL))
            num_blocks *= fs->blocksize / 512;
+       num_blocks *= EXT2FS_CLUSTER_RATIO(fs);
 
        b += num_blocks;
 
-       if (fs->super->s_feature_ro_compat &
-           EXT4_FEATURE_RO_COMPAT_HUGE_FILE) {
-               b += ((long long) inode->osd2.linux2.l_i_blocks_hi) << 32;
+       if (fs->super->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_HUGE_FILE)
                inode->osd2.linux2.l_i_blocks_hi = b >> 32;
-       } else if (b > 0xFFFFFFFF)
+       else if (b > 0xFFFFFFFF)
                return EOVERFLOW;
        inode->i_blocks = b & 0xFFFFFFFF;
        return 0;
@@ -53,21 +56,22 @@ errcode_t ext2fs_iblk_sub_blocks(ext2_filsys fs, struct ext2_inode *inode,
 {
        unsigned long long b = inode->i_blocks;
 
+       if (fs->super->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_HUGE_FILE)
+               b += ((long long) inode->osd2.linux2.l_i_blocks_hi) << 32;
+
        if (!(fs->super->s_feature_ro_compat &
              EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ||
            !(inode->i_flags & EXT4_HUGE_FILE_FL))
            num_blocks *= fs->blocksize / 512;
+       num_blocks *= EXT2FS_CLUSTER_RATIO(fs);
 
        if (num_blocks > b)
                return EOVERFLOW;
 
        b -= num_blocks;
 
-       if (fs->super->s_feature_ro_compat &
-           EXT4_FEATURE_RO_COMPAT_HUGE_FILE) {
-               b += ((long long) inode->osd2.linux2.l_i_blocks_hi) << 32;
+       if (fs->super->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_HUGE_FILE)
                inode->osd2.linux2.l_i_blocks_hi = b >> 32;
-       }
        inode->i_blocks = b & 0xFFFFFFFF;
        return 0;
 }
@@ -78,6 +82,7 @@ errcode_t ext2fs_iblk_set(ext2_filsys fs, struct ext2_inode *inode, blk64_t b)
              EXT4_FEATURE_RO_COMPAT_HUGE_FILE) ||
            !(inode->i_flags & EXT4_HUGE_FILE_FL))
                b *= fs->blocksize / 512;
+       b *= EXT2FS_CLUSTER_RATIO(fs);
 
        inode->i_blocks = b & 0xFFFFFFFF;
        if (fs->super->s_feature_ro_compat & EXT4_FEATURE_RO_COMPAT_HUGE_FILE)