diff options
author | Elliott Hughes <enh@google.com> | 2018-06-20 15:55:41 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-06-20 15:55:41 -0700 |
commit | 92fe5db069b92f149c545fbb4114cc5b26bc97b2 (patch) | |
tree | d7aef744e3cb4428dd9081c589259c83711123c1 | |
parent | 105322515de02a854d5dcecc1ab2c652c78bb348 (diff) | |
parent | 188c86eb2447174d47c30be090b67a40857b3441 (diff) | |
download | newfs_msdos-92fe5db069b92f149c545fbb4114cc5b26bc97b2.tar.gz |
Remove failing HDIO_GETGEO ioctl.master-cuttlefish-testing-release
am: 188c86eb24
Change-Id: I9d6320dcc8385375eca6499d366621b1203fb109
-rw-r--r-- | mkfs_msdos.c | 21 |
1 files changed, 2 insertions, 19 deletions
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 @@ static int getdiskinfo(int fd, const char *fname, const char *dtype, 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; |