diff options
-rw-r--r-- | sys/dev/vn/vn.c | 4 | ||||
-rw-r--r-- | sys/i386/isa/wd.c | 4 | ||||
-rw-r--r-- | sys/kern/subr_diskslice.c | 4 | ||||
-rw-r--r-- | sys/pc98/pc98/wd.c | 4 | ||||
-rw-r--r-- | sys/scsi/od.c | 4 | ||||
-rw-r--r-- | sys/scsi/sd.c | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/sys/dev/vn/vn.c b/sys/dev/vn/vn.c index 943fae2..ac44f70 100644 --- a/sys/dev/vn/vn.c +++ b/sys/dev/vn/vn.c @@ -38,7 +38,7 @@ * from: Utah Hdr: vn.c 1.13 94/04/02 * * from: @(#)vn.c 8.6 (Berkeley) 4/1/94 - * $Id: vn.c,v 1.50 1997/09/27 13:38:12 kato Exp $ + * $Id: vn.c,v 1.51 1997/10/21 09:51:47 kato Exp $ */ /* @@ -437,7 +437,7 @@ vnioctl(dev_t dev, int cmd, caddr_t data, int flag, struct proc *p) error = dsioctl("vn", dev, cmd, data, flag, &vn->sc_slices, vnstrategy, (ds_setgeom_t *)NULL); - if (error != -1) + if (error != ENOIOCTL) return (error); } if (dkslice(dev) != WHOLE_DISK_SLICE || diff --git a/sys/i386/isa/wd.c b/sys/i386/isa/wd.c index c9fac79..6bfa987 100644 --- a/sys/i386/isa/wd.c +++ b/sys/i386/isa/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.144 1997/11/07 09:20:34 phk Exp $ + * $Id: wd.c,v 1.145 1997/12/02 21:06:32 phk Exp $ */ /* TODO: @@ -1928,7 +1928,7 @@ wdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p) wdsleep(du->dk_ctrlr, "wdioct"); error = dsioctl("wd", dev, cmd, addr, flags, &du->dk_slices, wdstrategy1, (ds_setgeom_t *)NULL); - if (error != -1) + if (error != ENOIOCTL) return (error); switch (cmd) { diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index f5b284f..79bdfce 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -43,7 +43,7 @@ * from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $ * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: subr_diskslice.c,v 1.38 1997/09/16 10:11:49 bde Exp $ + * $Id: subr_diskslice.c,v 1.39 1997/11/07 09:20:38 phk Exp $ */ #include <sys/param.h> @@ -500,7 +500,7 @@ dsioctl(dname, dev, cmd, data, flags, sspp, strat, setgeom) return (0); default: - return (-1); + return (ENOIOCTL); } } diff --git a/sys/pc98/pc98/wd.c b/sys/pc98/pc98/wd.c index 7153947..fc18134 100644 --- a/sys/pc98/pc98/wd.c +++ b/sys/pc98/pc98/wd.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)wd.c 7.2 (Berkeley) 5/9/91 - * $Id: wd.c,v 1.36 1997/11/07 12:54:01 kato Exp $ + * $Id: wd.c,v 1.37 1997/12/02 21:06:54 phk Exp $ */ /* TODO: @@ -2133,7 +2133,7 @@ wdioctl(dev_t dev, int cmd, caddr_t addr, int flags, struct proc *p) wdsleep(du->dk_ctrlr, "wdioct"); error = dsioctl("wd", dev, cmd, addr, flags, &du->dk_slices, wdstrategy1, (ds_setgeom_t *)NULL); - if (error != -1) + if (error != ENOIOCTL) return (error); #ifdef PC98 diff --git a/sys/scsi/od.c b/sys/scsi/od.c index 989483f..9f9b077 100644 --- a/sys/scsi/od.c +++ b/sys/scsi/od.c @@ -28,7 +28,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $Id: od.c,v 1.32 1997/09/21 22:03:01 gibbs Exp $ + * $Id: od.c,v 1.33 1997/12/02 21:06:59 phk Exp $ */ /* @@ -701,7 +701,7 @@ od_ioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p, default: error = dsioctl("od", dev, cmd, addr, flag, &od->dk_slices, odstrategy1, (ds_setgeom_t *)NULL); - if (error == -1) { + if (error == ENOIOCTL) { if (PARTITION(dev) != RAW_PART) { error = ENOTTY; } else { diff --git a/sys/scsi/sd.c b/sys/scsi/sd.c index b07cbbb..fd6be1c 100644 --- a/sys/scsi/sd.c +++ b/sys/scsi/sd.c @@ -15,7 +15,7 @@ * * Ported to run under 386BSD by Julian Elischer (julian@dialix.oz.au) Sept 1992 * - * $Id: sd.c,v 1.114 1997/11/23 11:30:42 bde Exp $ + * $Id: sd.c,v 1.115 1997/12/02 21:07:03 phk Exp $ */ #include "opt_bounce.h" @@ -678,7 +678,7 @@ sd_ioctl(dev_t dev, int cmd, caddr_t addr, int flag, struct proc *p, error = dsioctl("sd", dev, cmd, addr, flag, &sd->dk_slices, sdstrategy1, (ds_setgeom_t *)NULL); scsi_device_unlock(sc_link); - if (error != -1) + if (error != ENOIOCTL) return (error); if (PARTITION(dev) != RAW_PART) return (ENOTTY); |