From c1be496a932c9eeada42bb646fe32e77fbcd0784 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 11 May 2015 13:01:26 +0200 Subject: [PATCH] libfdisk: keep FDISK_FIELD_CYLINDERS independent on context mode Signed-off-by: Karel Zak --- libfdisk/src/partition.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c index e892e9dd87..c09edf6389 100644 --- a/libfdisk/src/partition.c +++ b/libfdisk/src/partition.c @@ -815,9 +815,12 @@ int fdisk_partition_to_string(struct fdisk_partition *pa, } break; case FDISK_FIELD_CYLINDERS: - rc = asprintf(&p, "%ju", (uintmax_t) - fdisk_cround(cxt, fdisk_partition_has_size(pa) ? pa->size : 0)); + { + uintmax_t sz = fdisk_partition_has_size(pa) ? pa->size : 0; + if (sz) + rc = asprintf(&p, "%ju", (sz / (cxt->geom.heads * cxt->geom.sectors)) + 1); break; + } case FDISK_FIELD_SECTORS: rc = asprintf(&p, "%ju", fdisk_partition_has_size(pa) ? (uintmax_t) pa->size : 0); -- 2.47.3