diff options
author | bde <bde@FreeBSD.org> | 1995-09-16 17:04:06 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1995-09-16 17:04:06 +0000 |
commit | c7c302cc62d13fbb94de888397975d48f0b34ddc (patch) | |
tree | 49fce373ccc1b7b659ad0172323dfe7e8e5a1a11 /sys/dev/fdc | |
parent | f96d2d37101a40564bb5591c85fd4ce376c5ee3d (diff) | |
download | FreeBSD-src-c7c302cc62d13fbb94de888397975d48f0b34ddc.zip FreeBSD-src-c7c302cc62d13fbb94de888397975d48f0b34ddc.tar.gz |
Remove transitory labelling code. Labels are now handled by essentially
the original 4.4lite code. Machine Specific Partitions are now handled
separately.
Diffstat (limited to 'sys/dev/fdc')
-rw-r--r-- | sys/dev/fdc/fdc.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index 17bef91..d0748b1 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -43,7 +43,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.62 1995/06/11 19:31:19 rgrimes Exp $ + * $Id: fd.c,v 1.63 1995/09/03 05:43:28 julian Exp $ * */ @@ -1834,7 +1834,8 @@ fdioctl(dev, cmd, addr, flag, p) dl->d_secpercyl = fdt->size / fdt->tracks; dl->d_type = DTYPE_FLOPPY; - if (readdisklabel(dev, fdstrategy, dl, NULL, 0) == NULL) + if (readdisklabel(dkmodpart(dev, RAW_PART), fdstrategy, dl) + == NULL) error = 0; else error = EINVAL; @@ -1861,8 +1862,8 @@ fdioctl(dev, cmd, addr, flag, p) dl = (struct disklabel *)addr; - if ((error = - setdisklabel ((struct disklabel *)buffer, dl, 0))) + if ((error = setdisklabel((struct disklabel *)buffer, dl, + (u_long)0)) != 0) break; error = writedisklabel(dev, fdstrategy, |