diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-25 10:33:25 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-25 10:38:39 +0200 |
| commit | 07f0462a457729f7e1eba6396c8fb4bea9cf46a2 (patch) | |
| tree | ddc208ac249639d75f01c87ea1d758cbe352d06a /fs/ext4 | |
| parent | 400b4e2bb3e1f4567ce794b369f3b4b7e8e08ed1 (diff) | |
| download | barebox-07f0462a457729f7e1eba6396c8fb4bea9cf46a2.tar.gz barebox-07f0462a457729f7e1eba6396c8fb4bea9cf46a2.tar.xz | |
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>
Diffstat (limited to 'fs/ext4')
| -rw-r--r-- | fs/ext4/ext4_common.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 5bff86897c..1bd9215190 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -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 |