sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

fs: ext4: use EXT2_BLOCK_SIZE instead of fs->blksz 

From U-Boot commit:

| commit 470173274d9ceb18a7140ef93e20be6c2236e7d9
| Author: Ionut Nicu <ioan.nicu.ext@nsn.com>
| Date:   Mon Jan 13 11:59:24 2014 +0100
|
|     ext4fs: use EXT2_BLOCK_SIZE instead of fs->blksz
|
|     Using fs->blksz in ext4fs_get_extent_block() is not
|     correct since fs->blksz is not initialized on the
|     read path. Use EXT2_BLOCK_SIZE() instead which will
|     produce the desired output.
|
|     Signed-off-by: Ionut Nicu <ioan.nicu.ext@nsn.com>
|     Signed-off-by: Mathias Rulf <mathias.rulf@nsn.com>

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2014-07-25 10:33:25 +02:00
parent 400b4e2bb3
commit 07f0462a45
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ext4/ext4_common.c
View File

@ -45,6 +45,7 @@ static struct ext4_extent_header *ext4fs_get_extent_block(struct ext2_data *data
struct ext4_extent_idx *index;
unsigned long long block;
struct ext_filesystem *fs = data->fs;
int blksz = EXT2_BLOCK_SIZE(data);
int i, ret;
while (1) {
@ -68,7 +69,7 @@ static struct ext4_extent_header *ext4fs_get_extent_block(struct ext2_data *data
block = le32_to_cpu(index[i].ei_leaf_hi);
block = (block << 32) + le32_to_cpu(index[i].ei_leaf_lo);
ret = ext4fs_devread(fs, block << log2_blksz, 0, fs->blksz, buf);
ret = ext4fs_devread(fs, block << log2_blksz, 0, blksz, buf);
if (ret)
return NULL;
else