diff options
Diffstat (limited to 'sys/scsi')
| -rw-r--r-- | sys/scsi/cd.c | 4 | ||||
| -rw-r--r-- | sys/scsi/sd.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/scsi/cd.c b/sys/scsi/cd.c index 24432963952..0325b93c54e 100644 --- a/sys/scsi/cd.c +++ b/sys/scsi/cd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cd.c,v 1.198 2011/03/17 21:30:24 deraadt Exp $ */ +/* $OpenBSD: cd.c,v 1.199 2011/05/31 17:35:35 matthew Exp $ */ /* $NetBSD: cd.c,v 1.100 1997/04/02 02:29:30 mycroft Exp $ */ /* @@ -884,7 +884,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) sc->sc_flags |= CDF_LABELLING; error = setdisklabel(sc->sc_dk.dk_label, - (struct disklabel *)addr, /*cd->sc_dk.dk_openmask : */0); + (struct disklabel *)addr, sc->sc_dk.dk_openmask); if (error == 0) { } diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index 848d0a04a8c..03fd0487e2c 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sd.c,v 1.225 2011/04/08 10:37:39 krw Exp $ */ +/* $OpenBSD: sd.c,v 1.226 2011/05/31 17:35:35 matthew Exp $ */ /* $NetBSD: sd.c,v 1.111 1997/04/02 02:29:41 mycroft Exp $ */ /*- @@ -935,7 +935,7 @@ sdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p) sc->flags |= SDF_LABELLING; error = setdisklabel(sc->sc_dk.dk_label, - (struct disklabel *)addr, /*sd->sc_dk.dk_openmask : */0); + (struct disklabel *)addr, sc->sc_dk.dk_openmask); if (error == 0) { if (cmd == DIOCWDINFO) error = writedisklabel(DISKLABELDEV(dev), |