* [U-Boot] [PATCH 1/2] ext4fs: use EXT2_BLOCK_SIZE instead of fs->blksz
@ 2014-01-13 10:59 Ionut Nicu
2014-01-20 22:59 ` [U-Boot] [U-Boot, " Tom Rini
0 siblings, 1 reply; 2+ messages in thread
From: Ionut Nicu @ 2014-01-13 10:59 UTC (permalink / raw)
To: u-boot
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>
---
fs/ext4/ext4_common.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c
index 352943e..37b6c46 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
--
1.7.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [U-Boot] [U-Boot, 1/2] ext4fs: use EXT2_BLOCK_SIZE instead of fs->blksz
2014-01-13 10:59 [U-Boot] [PATCH 1/2] ext4fs: use EXT2_BLOCK_SIZE instead of fs->blksz Ionut Nicu
@ 2014-01-20 22:59 ` Tom Rini
0 siblings, 0 replies; 2+ messages in thread
From: Tom Rini @ 2014-01-20 22:59 UTC (permalink / raw)
To: u-boot
On Mon, Jan 13, 2014 at 11:59:24AM +0100, Ionut Nicu wrote:
> 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>
Applied to u-boot/master, thanks!
--
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-20 22:59 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-01-13 10:59 [U-Boot] [PATCH 1/2] ext4fs: use EXT2_BLOCK_SIZE instead of fs->blksz Ionut Nicu
2014-01-20 22:59 ` [U-Boot] [U-Boot, " Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.