commit 0c7e133c7fde67911efb7bd920d4f0ab0c269af8
author Elliott Hughes <enh@google.com> Wed Jun 20 15:59:42 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Jun 20 15:59:42 2018 -0700
tree d7aef744e3cb4428dd9081c589259c83711123c1
parent 0163d9ee79315fa0801b3fc2377eb48247933086
parent 92fe5db069b92f149c545fbb4114cc5b26bc97b2

Remove failing HDIO_GETGEO ioctl. am: 188c86eb24
am: 92fe5db069

Change-Id: I73ab3b65404b14ce47673f63ad2117f79a35fe4b

mkfs_msdos.c

diff --git a/mkfs_msdos.c b/mkfs_msdos.c
index 350b782..04afc84 100644
--- a/mkfs_msdos.c
+++ b/mkfs_msdos.c
@@ -852,27 +852,10 @@
 
     bpb->bpbHugeSectors = (u_int)block_size;
 
-    struct hd_geometry geom;
-    if (ioctl(fd, HDIO_GETGEO, &geom)) {
-        warn("ioctl(HDIO_GETGEO) failed, but will use sane values");
-        geom.heads = 64;
-        geom.sectors = 63;
-    }
-
-    if (!geom.heads) {
-        warnx("Bogus heads from kernel - setting sane value");
-        geom.heads = 64;
-    }
-
-    if (!geom.sectors) {
-        warnx("Bogus sectors from kernel - setting sane value");
-        geom.sectors = 63;
-    }
-
-    bpb->bpbSecPerTrack = geom.sectors;
+    bpb->bpbSecPerTrack = 63;
     if (ckgeom(fname, bpb->bpbSecPerTrack, "sectors/track") == -1) return -1;
 
-    bpb->bpbHeads = geom.heads;
+    bpb->bpbHeads = 64;
     if (ckgeom(fname, bpb->bpbHeads, "drive heads") == -1) return -1;
 
     return 0;