|
@@ -1432,7 +1432,7 @@ static struct ext4_extent_header *ext4fs_get_extent_block
|
|
while (1) {
|
|
while (1) {
|
|
index = (struct ext4_extent_idx *)(ext_block + 1);
|
|
index = (struct ext4_extent_idx *)(ext_block + 1);
|
|
|
|
|
|
- if (le32_to_cpu(ext_block->eh_magic) != EXT4_EXT_MAGIC)
|
|
|
|
|
|
+ if (le16_to_cpu(ext_block->eh_magic) != EXT4_EXT_MAGIC)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
if (ext_block->eh_depth == 0)
|
|
if (ext_block->eh_depth == 0)
|
|
@@ -1440,14 +1440,14 @@ static struct ext4_extent_header *ext4fs_get_extent_block
|
|
i = -1;
|
|
i = -1;
|
|
do {
|
|
do {
|
|
i++;
|
|
i++;
|
|
- if (i >= le32_to_cpu(ext_block->eh_entries))
|
|
|
|
|
|
+ if (i >= le16_to_cpu(ext_block->eh_entries))
|
|
break;
|
|
break;
|
|
} while (fileblock > le32_to_cpu(index[i].ei_block));
|
|
} while (fileblock > le32_to_cpu(index[i].ei_block));
|
|
|
|
|
|
if (--i < 0)
|
|
if (--i < 0)
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
- block = le32_to_cpu(index[i].ei_leaf_hi);
|
|
|
|
|
|
+ block = le16_to_cpu(index[i].ei_leaf_hi);
|
|
block = (block << 32) + le32_to_cpu(index[i].ei_leaf_lo);
|
|
block = (block << 32) + le32_to_cpu(index[i].ei_leaf_lo);
|
|
|
|
|
|
if (ext4fs_devread((lbaint_t)block << log2_blksz, 0, fs->blksz,
|
|
if (ext4fs_devread((lbaint_t)block << log2_blksz, 0, fs->blksz,
|
|
@@ -1548,17 +1548,17 @@ long int read_allocated_block(struct ext2_inode *inode, int fileblock)
|
|
|
|
|
|
do {
|
|
do {
|
|
i++;
|
|
i++;
|
|
- if (i >= le32_to_cpu(ext_block->eh_entries))
|
|
|
|
|
|
+ if (i >= le16_to_cpu(ext_block->eh_entries))
|
|
break;
|
|
break;
|
|
} while (fileblock >= le32_to_cpu(extent[i].ee_block));
|
|
} while (fileblock >= le32_to_cpu(extent[i].ee_block));
|
|
if (--i >= 0) {
|
|
if (--i >= 0) {
|
|
fileblock -= le32_to_cpu(extent[i].ee_block);
|
|
fileblock -= le32_to_cpu(extent[i].ee_block);
|
|
- if (fileblock >= le32_to_cpu(extent[i].ee_len)) {
|
|
|
|
|
|
+ if (fileblock >= le16_to_cpu(extent[i].ee_len)) {
|
|
free(buf);
|
|
free(buf);
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
- start = le32_to_cpu(extent[i].ee_start_hi);
|
|
|
|
|
|
+ start = le16_to_cpu(extent[i].ee_start_hi);
|
|
start = (start << 32) +
|
|
start = (start << 32) +
|
|
le32_to_cpu(extent[i].ee_start_lo);
|
|
le32_to_cpu(extent[i].ee_start_lo);
|
|
free(buf);
|
|
free(buf);
|