diff options
| author | Karel Zak | 2017-07-19 15:09:36 +0200 |
|---|---|---|
| committer | Karel Zak | 2017-07-19 15:09:36 +0200 |
| commit | 537b4db151085fadf357bd4e7242798b16daabcd (patch) | |
| tree | abb33789b0a90b129f21532d80eb39d4c08632ef /libfdisk/src/partition.c | |
| parent | libfdisk: improve table print debugs (diff) | |
| download | kernel-qcow2-util-linux-537b4db151085fadf357bd4e7242798b16daabcd.tar.gz kernel-qcow2-util-linux-537b4db151085fadf357bd4e7242798b16daabcd.tar.xz kernel-qcow2-util-linux-537b4db151085fadf357bd4e7242798b16daabcd.zip | |
libfdisk: allow to resize in unsorted partition table
The current code assumes that partition offsets (starts) are sorted.
This is usual situation, but unsorted partition table is also valid...
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/partition.c')
| -rw-r--r-- | libfdisk/src/partition.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c index bc52ea573..93e6d9a49 100644 --- a/libfdisk/src/partition.c +++ b/libfdisk/src/partition.c @@ -1061,14 +1061,15 @@ static int resize_get_last_possible( while (fdisk_table_next_partition(tb, &itr, &pa) == 0) { - DBG(TAB, ul_debugobj(tb, " checking entry %p [start=%ju, end=%ju, size=%ju, %s %s %s]", + DBG(TAB, ul_debugobj(tb, " checking entry %p [partno=%zu start=%ju, end=%ju, size=%ju%s%s%s]", pa, + fdisk_partition_get_partno(pa), (uintmax_t) fdisk_partition_get_start(pa), (uintmax_t) fdisk_partition_get_end(pa), (uintmax_t) fdisk_partition_get_size(pa), - fdisk_partition_is_freespace(pa) ? "freespace" : "", - fdisk_partition_is_nested(pa) ? "nested" : "", - fdisk_partition_is_container(pa) ? "container" : "primary")); + fdisk_partition_is_freespace(pa) ? " freespace" : "", + fdisk_partition_is_nested(pa) ? " nested" : "", + fdisk_partition_is_container(pa) ? " container" : "")); if (!fdisk_partition_has_start(pa) || !fdisk_partition_has_size(pa) || @@ -1147,6 +1148,11 @@ static int recount_resize( if (rc) return rc; + fdisk_table_sort_partitions(tb, fdisk_partition_cmp_start); + + DBG(PART, ul_debugobj(tpl, "resize partition partno=%zu in table:", partno)); + ON_DBG(PART, fdisk_debug_print_table(tb)); + cur = fdisk_table_get_partition_by_partno(tb, partno); if (!cur) { fdisk_unref_table(tb); |