]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libfdisk: keep FDISK_FIELD_CYLINDERS independent on context mode
authorKarel Zak <kzak@redhat.com>
Mon, 11 May 2015 11:01:26 +0000 (13:01 +0200)
committerKarel Zak <kzak@redhat.com>
Mon, 11 May 2015 11:01:26 +0000 (13:01 +0200)
Signed-off-by: Karel Zak <kzak@redhat.com>
libfdisk/src/partition.c

index e892e9dd87c22ddb0e6b2122c90682faaae7f9d4..c09edf6389e3dd4d2e62a31a41dca2acb843e159 100644 (file)
@@ -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);