]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
libfdisk: remove ifdef HDIO_GETGEO
authorRuediger Meier <ruediger.meier@ga-group.nl>
Thu, 25 Feb 2016 19:29:30 +0000 (20:29 +0100)
committerRuediger Meier <ruediger.meier@ga-group.nl>
Mon, 7 Mar 2016 22:29:05 +0000 (23:29 +0100)
We don't use HDIO_GETGEO since e5b5a349.

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
libfdisk/src/sgi.c
libfdisk/src/sun.c

index 6228cf87dbbecd30129dd64a9e9de19ce6d6e9df..c77724aa21d8fd836ea04493a1c7adc10493ccc2 100644 (file)
@@ -968,7 +968,6 @@ static int sgi_create_disklabel(struct fdisk_context *cxt)
        assert(cxt->label);
        assert(fdisk_is_label(cxt, SGI));
 
-#ifdef HDIO_GETGEO
        if (cxt->geom.heads && cxt->geom.sectors) {
                fdisk_sector_t llsectors;
 
@@ -990,7 +989,7 @@ static int sgi_create_disklabel(struct fdisk_context *cxt)
                                  "> 33.8 GB."), cxt->dev_path, cxt->geom.cylinders);
                }
        }
-#endif
+
        rc = fdisk_init_firstsector_buffer(cxt, 0, 0);
        if (rc)
                return rc;
index a50076a87f81982bac1490ba2d6fa36c238309b5..a97ecac0a09324a6ff30e0b724ae47e0fe6ecbda 100644 (file)
@@ -225,7 +225,6 @@ static int sun_create_disklabel(struct fdisk_context *cxt)
        sunlabel->vtoc.sanity = cpu_to_be32(SUN_VTOC_SANITY);
        sunlabel->vtoc.nparts = cpu_to_be16(SUN_MAXPARTITIONS);
 
-#ifdef HDIO_GETGEO
        if (cxt->geom.heads && cxt->geom.sectors) {
                fdisk_sector_t llsectors;
 
@@ -246,7 +245,6 @@ static int sun_create_disklabel(struct fdisk_context *cxt)
                                cxt->dev_path, cxt->geom.cylinders);
                }
        } else
-#endif
                ask_geom(cxt);
 
        sunlabel->acyl   = cpu_to_be16(0);