ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libfdisk: again improve freespace code 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-02-03 18:05:57 +01:00
parent 45333e9d71
commit aa423fd39e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libfdisk/src/table.c
View File

@ -438,10 +438,11 @@ int fdisk_get_freespaces(struct fdisk_context *cxt, struct fdisk_table **tb)
fdisk_reset_iter(&itr, FDISK_ITER_FORWARD);
while (fdisk_table_next_partition(parts, &itr, &pa) == 0) {
uint64_t lastfree = pa->start - 1 - cxt->first_lba;
uint64_t lastfree;
if (!pa->used || !pa->nested)
continue;
lastfree = pa->start - 1 - cxt->first_lba;
if (last + grain < lastfree) {
rc = table_add_freespace(cxt, *tb,
last + grain, lastfree,
@ -457,7 +458,7 @@ int fdisk_get_freespaces(struct fdisk_context *cxt, struct fdisk_table **tb)
/* free-space remaining in extended partition */
x = fdisk_partition_get_start(parent)
+ fdisk_partition_get_size(parent) - 1;
if (last + grain < x)
if (last + grain < x) {
rc = table_add_freespace(cxt, *tb,
last + grain, x - 1,
dosort, &fr);
@ -466,6 +467,7 @@ int fdisk_get_freespaces(struct fdisk_context *cxt, struct fdisk_table **tb)
fr->nested = 1;
}
}
}
done:
fdisk_unref_table(parts);