Skip to contentSkip to conversation

ext4fs: use EXT2_BLOCK_SIZE instead of fs->blksz

PATCH New Ionut Nicu 2 participants 2 messages Jan 13, 2014 – Jan 20, 2014 ext4 file system

lore
Share & tools
lore

Ionut Nicu

author
#0 lore raw

PATCH 1/2 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 <[email protected]>
Signed-off-by Mathias Rulf <[email protected]>
---
 fs/ext4/ext4_common.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
fs/ext4/ext4_common.c +2 -2
index 352943e..37b6c46 100644
@@ -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
Signature · 1 line
1.7.1
#1 lore raw

PATCH 1/2 ext4fs: use EXT2_BLOCK_SIZE instead of fs->blksz

Quoted 7 lines · Ionut Nicu

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 <[email protected]>
Signed-off-by Mathias Rulf <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20140120/81945fdd/attachment.pgp>