diff options
author | Elliott Hughes <enh@google.com> | 2018-06-20 15:59:42 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-06-20 15:59:42 -0700 |
commit | 0c7e133c7fde67911efb7bd920d4f0ab0c269af8 (patch) | |
tree | d7aef744e3cb4428dd9081c589259c83711123c1 | |
parent | 0163d9ee79315fa0801b3fc2377eb48247933086 (diff) | |
parent | 92fe5db069b92f149c545fbb4114cc5b26bc97b2 (diff) | |
download | newfs_msdos-0c7e133c7fde67911efb7bd920d4f0ab0c269af8.tar.gz |
Remove failing HDIO_GETGEO ioctl. am: 188c86eb24android-wear-8.0.0_r2
am: 92fe5db069
Change-Id: I73ab3b65404b14ce47673f63ad2117f79a35fe4b
-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; |