sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

partitions: dos: improve guess of disk size 

The code used to ineffectively take the end of the last partition as guess
for the disk size. Better use the end of the partition that has its end
rearmost.

Also return an unsigned type instead of int as the result is always
non-negative.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Uwe Kleine-König 2013-11-08 11:13:01 +01:00 committed by Sascha Hauer
parent 480782a265
commit e55160fe10
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
common/partitions/dos.c
View File

@ -27,19 +27,23 @@
* @param table partition table
* @return sector count
*/
static int disk_guess_size(struct device_d *dev, struct partition_entry *table)
static uint64_t disk_guess_size(struct device_d *dev,
struct partition_entry *table)
{
uint64_t size = 0;
int i;
for (i = 0; i < 4; i++) {
if (table[i].partition_start != 0) {
size += get_unaligned_le32(&table[i].partition_start) - size;
size += get_unaligned_le32(&table[i].partition_size);
if (get_unaligned_le32(&table[i].partition_start) != 0) {
uint64_t part_end = get_unaligned_le32(&table[i].partition_start) +
get_unaligned_le32(&table[i].partition_size);
if (size < part_end)
size = part_end;
}
}
return (int)size;
return size;
}
static void *read_mbr(struct block_device *blk)