summaryrefslogtreecommitdiffstats
path: root/libfdisk/src/partition.c
diff options
context:
space:
mode:
authorKarel Zak2015-05-11 13:01:26 +0200
committerKarel Zak2015-05-11 13:01:26 +0200
commitc1be496a932c9eeada42bb646fe32e77fbcd0784 (patch)
tree796c20ba0af0ed3fd65fd3ddb6128fe860be2f1a /libfdisk/src/partition.c
parentfdisk: provide more information by 'i'nfo command (diff)
downloadkernel-qcow2-util-linux-c1be496a932c9eeada42bb646fe32e77fbcd0784.tar.gz
kernel-qcow2-util-linux-c1be496a932c9eeada42bb646fe32e77fbcd0784.tar.xz
kernel-qcow2-util-linux-c1be496a932c9eeada42bb646fe32e77fbcd0784.zip
libfdisk: keep FDISK_FIELD_CYLINDERS independent on context mode
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'libfdisk/src/partition.c')
-rw-r--r--libfdisk/src/partition.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/libfdisk/src/partition.c b/libfdisk/src/partition.c
index e892e9dd8..c09edf638 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);