diff options
| author |   dlg <dlg@openbsd.org> | 2010-06-15 04:11:34 +0000 |
|---|---|---|
| committer | dlg <dlg@openbsd.org> | 2010-06-15 04:11:34 +0000 |
| commit | fdca2419cc0b8e0f0bc45ff9431cce3eebd89a49 (patch) | |
| tree | 08a36fd1a3e7bb612b868f5ea088a4df9e52b7be /sys/dev/softraid.c | |
| parent | fix keyword sort order (diff) | |
| download | wireguard-openbsd-fdca2419cc0b8e0f0bc45ff9431cce3eebd89a49.tar.xz wireguard-openbsd-fdca2419cc0b8e0f0bc45ff9431cce3eebd89a49.zip | |
dont pass the dev_t from the scsi device drivers into the midlayer for
ioctl requests, and dont pass the proc pointers around for any ioctl
requests in scsi land at all. neither were used, so trim the fat.
ok krw@ marco@
Diffstat (limited to 'sys/dev/softraid.c')
| -rw-r--r-- | sys/dev/softraid.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c index 94b2f427d14..c679eb27ce0 100644 --- a/sys/dev/softraid.c +++ b/sys/dev/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.204 2010/05/21 20:52:38 marco Exp $ */ +/* $OpenBSD: softraid.c,v 1.205 2010/06/15 04:11:34 dlg Exp $ */ /* * Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us> * Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org> @@ -93,7 +93,7 @@ void sr_minphys(struct buf *bp, struct scsi_link *sl); void sr_copy_internal_data(struct scsi_xfer *, void *, size_t); int sr_scsi_ioctl(struct scsi_link *, u_long, - caddr_t, int, struct proc *); + caddr_t, int); int sr_ioctl(struct device *, u_long, caddr_t); int sr_ioctl_inq(struct sr_softc *, struct bioc_inq *); int sr_ioctl_vol(struct sr_softc *, struct bioc_vol *); @@ -1962,8 +1962,7 @@ complete: sr_scsi_done(sd, xs); } int -sr_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag, - struct proc *p) +sr_scsi_ioctl(struct scsi_link *link, u_long cmd, caddr_t addr, int flag) { DNPRINTF(SR_D_IOCTL, "%s: sr_scsi_ioctl cmd: %#x\n", DEVNAME((struct sr_softc *)link->adapter_softc), cmd); |