From: Ionut Nicu Date: Mon, 13 Jan 2014 10:59:24 +0000 (+0100) Subject: ext4fs: use EXT2_BLOCK_SIZE instead of fs->blksz X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=470173274d9ceb18a7140ef93e20be6c2236e7d9;p=u-boot.git 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 Signed-off-by: Mathias Rulf --- diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index cff50d8c17..c5e654235a 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -1414,7 +1414,7 @@ static struct ext4_extent_header *ext4fs_get_extent_block { struct ext4_extent_idx *index; unsigned long long block; - struct ext_filesystem *fs = get_fs(); + int blksz = EXT2_BLOCK_SIZE(data); int i; while (1) { @@ -1438,7 +1438,7 @@ static struct ext4_extent_header *ext4fs_get_extent_block block = le16_to_cpu(index[i].ei_leaf_hi); 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, blksz, buf)) ext_block = (struct ext4_extent_header *)buf; else