diff options
| author | Frederic Leroy <fredo@starox.org> | 2013-06-26 18:11:25 +0200 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-07-15 17:06:13 -0400 |
| commit | 04735e9c5578dd4f3584be5454b9779e8e5c2af9 (patch) | |
| tree | 5641d35f98ffda64ff900a8356639eeb88f320a5 /disk | |
| parent | 0eb33ad253026d5a773854dd42b2a56937678aa9 (diff) | |
Fix ext2/ext4 filesystem accesses beyond 2TiB
With CONFIG_SYS_64BIT_LBA, lbaint_t gets defined as a 64-bit type,
which is required to represent block numbers for storage devices that
exceed 2TiB (the block size usually is 512B), e.g. recent hard drives
We now use lbaint_t for partition offset to reflect the lbaint_t change,
and access partitions beyond or crossing the 2.1TiB limit.
This required changes to signature of ext4fs_devread(), and type of all
variables relatives to block sector.
ext2/ext4 fs uses logical block represented by a 32 bit value. Logical
block is a multiple of device block sector. To avoid overflow problem
when calling ext4fs_devread(), we need to cast the sector parameter.
Signed-off-by: Frédéric Leroy <fredo@starox.org>
Diffstat (limited to 'disk')
| -rw-r--r-- | disk/part_efi.c | 6 | ||||
| -rw-r--r-- | disk/part_iso.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/disk/part_efi.c b/disk/part_efi.c index fb5e9f0477a..732bdb56b69 100644 --- a/disk/part_efi.c +++ b/disk/part_efi.c @@ -200,8 +200,8 @@ int get_partition_info_efi(block_dev_desc_t * dev_desc, int part, uuid_string(gpt_pte[part - 1].unique_partition_guid.b, info->uuid); #endif - debug("%s: start 0x%lX, size 0x%lX, name %s", __func__, - info->start, info->size, info->name); + debug("%s: start 0x" LBAF ", size 0x" LBAF ", name %s", __func__, + info->start, info->size, info->name); /* Remember to free pte */ free(gpt_pte); @@ -431,7 +431,7 @@ int gpt_fill_pte(gpt_header *gpt_h, gpt_entry *gpt_e, gpt_e[i].partition_name[k] = (efi_char16_t)(partitions[i].name[k]); - debug("%s: name: %s offset[%d]: 0x%x size[%d]: 0x%lx\n", + debug("%s: name: %s offset[%d]: 0x%x size[%d]: 0x" LBAF "\n", __func__, partitions[i].name, i, offset, i, partitions[i].size); } diff --git a/disk/part_iso.c b/disk/part_iso.c index cc323b099cd..a050c445ef0 100644 --- a/disk/part_iso.c +++ b/disk/part_iso.c @@ -249,8 +249,8 @@ void print_part_iso(block_dev_desc_t * dev_desc) printf("Part Start Sect x Size Type\n"); i=0; do { - printf (" %2d %8ld %8ld %6ld %.32s\n", - i, info.start, info.size, info.blksz, info.type); + printf(" %2d " LBAFU " " LBAFU " %6ld %.32s\n", + i, info.start, info.size, info.blksz, info.type); i++; } while (get_partition_info_iso_verb(dev_desc,i,&info,0)!=-1); } |