diff options
| author | jkh <jkh@FreeBSD.org> | 1994-10-27 20:45:13 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1994-10-27 20:45:13 +0000 |
| commit | 1ca2f392e18c355a8108c5c84aa5e4705aedc786 (patch) | |
| tree | 0f822c63937b648594897abc7f741b0a112e7844 /sys/dev | |
| parent | 6cc6dda103dfdc45f437f7bccf591034663fd883 (diff) | |
| download | FreeBSD-src-1ca2f392e18c355a8108c5c84aa5e4705aedc786.zip FreeBSD-src-1ca2f392e18c355a8108c5c84aa5e4705aedc786.tar.gz | |
Julian Elischer's disklabel fixes.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/fdc/fdc.c | 8 | ||||
| -rw-r--r-- | sys/dev/mcd/mcd.c | 3 |
2 files changed, 5 insertions, 6 deletions
diff --git a/sys/dev/fdc/fdc.c b/sys/dev/fdc/fdc.c index a000acf..e06ac4a 100644 --- a/sys/dev/fdc/fdc.c +++ b/sys/dev/fdc/fdc.c @@ -40,7 +40,7 @@ * SUCH DAMAGE. * * from: @(#)fd.c 7.4 (Berkeley) 5/25/91 - * $Id: fd.c,v 1.36 1994/10/21 16:58:50 joerg Exp $ + * $Id: fd.c,v 1.37 1994/10/23 21:27:12 wollman Exp $ * */ @@ -1522,7 +1522,7 @@ 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, 0) == NULL) + if (readdisklabel(dev, fdstrategy, dl, NULL, 0) == NULL) error = 0; else error = EINVAL; @@ -1550,11 +1550,11 @@ fdioctl(dev, cmd, addr, flag, p) dl = (struct disklabel *)addr; if ((error = - setdisklabel ((struct disklabel *)buffer, dl, 0, NULL))) + setdisklabel ((struct disklabel *)buffer, dl, 0))) break; error = writedisklabel(dev, fdstrategy, - (struct disklabel *)buffer, NULL); + (struct disklabel *)buffer); break; case FD_FORM: diff --git a/sys/dev/mcd/mcd.c b/sys/dev/mcd/mcd.c index e27f600..a6d4bbb 100644 --- a/sys/dev/mcd/mcd.c +++ b/sys/dev/mcd/mcd.c @@ -39,7 +39,7 @@ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: mcd.c,v 1.25 1994/09/14 20:28:25 ache Exp $ + * $Id: mcd.c,v 1.26 1994/10/23 21:27:29 wollman Exp $ */ static char COPYRIGHT[] = "mcd-driver (C)1993 by H.Veit & B.Moore"; @@ -483,7 +483,6 @@ MCD_TRACE("ioctl called 0x%x\n",cmd,0,0,0); else { return setdisklabel(&cd->dlabel, (struct disklabel *) addr, - 0, 0); } case DIOCWLABEL: |
