From: Karel Zak <kzak@redhat.com>
Date: Wed, 19 Jul 2017 13:09:36 +0000 (+0200)
Subject: libfdisk: allow to resize in unsorted partition table
X-Git-Tag: v2.31-rc1~179
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=537b4db151085fadf357bd4e7242798b16daabcd;p=thirdparty%2Futil-linux.git

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>
---

diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c
index bc52ea5735..93e6d9a491 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);