aboutsummaryrefslogtreecommitdiff
path: root/sys/contrib
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2002-09-20 19:36:05 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2002-09-20 19:36:05 +0000
commit7812d86f03dbed973e20eee5da963ae5efc666c4 (patch)
tree47b5afae3623c1371d19a0478c850d8e6a08d07b /sys/contrib
parent5741a42f2f25ab4f5bff0b8f213cbb93aae1b5ac (diff)
Notes
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/dev/fla/fla.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/sys/contrib/dev/fla/fla.c b/sys/contrib/dev/fla/fla.c
index 610f1ac05955..ac2a8abffbf3 100644
--- a/sys/contrib/dev/fla/fla.c
+++ b/sys/contrib/dev/fla/fla.c
@@ -116,7 +116,7 @@ flaopen(dev_t dev, int flag, int fmt, struct thread *td)
{
struct fla_s *sc;
int error;
- struct disklabel *dl;
+ u_int spu, ncyl, nt, ns;
if (fla_debug)
printf("flaopen(%s %x %x %p)\n",
@@ -131,12 +131,11 @@ flaopen(dev_t dev, int flag, int fmt, struct thread *td)
return (EIO);
}
- dl = &sc->disk.d_label;
- bzero(dl, sizeof(*dl));
- error = doc2k_size(sc->unit, &dl->d_secperunit,
- &dl->d_ncylinders, &dl->d_ntracks, &dl->d_nsectors);
- dl->d_secsize = DEV_BSIZE;
- dl->d_secpercyl = dl->d_ntracks * dl->d_nsectors; /* XXX */
+ error = doc2k_size(sc->unit, &spu, &ncyl, &nt, &ns);
+ sc->disk.d_sectorsize = DEV_BSIZE;
+ sc->disk.d_mediasize = (off_t)spu * DEV_BSIZE;
+ sc->disk.d_fwsectors = ns;
+ sc->disk.d_fwheads = nt;
return (0);
}