summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authoreivind <eivind@FreeBSD.org>1999-01-12 16:26:19 +0000
committereivind <eivind@FreeBSD.org>1999-01-12 16:26:19 +0000
commit7978f786762e6c0537e36ab90e4698674139f4de (patch)
tree96a8fc4e191bd8ef53d38b7b1394c537524d0381 /sys
parent0df7b422a94727c4da413cde37859a75924c2d5c (diff)
downloadFreeBSD-src-7978f786762e6c0537e36ab90e4698674139f4de.zip
FreeBSD-src-7978f786762e6c0537e36ab90e4698674139f4de.tar.gz
Make dsopen() and dsioctl() use cdstrategy1 instead of cdstrategy.
This silence the warnings and makes it more obvious where the bugs have to be fixed.
Diffstat (limited to 'sys')
-rw-r--r--sys/cam/scsi/scsi_cd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/cam/scsi/scsi_cd.c b/sys/cam/scsi/scsi_cd.c
index 3d3fc15..0ebc685 100644
--- a/sys/cam/scsi/scsi_cd.c
+++ b/sys/cam/scsi/scsi_cd.c
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: scsi_cd.c,v 1.12 1999/01/07 20:20:57 mjacob Exp $
+ * $Id: scsi_cd.c,v 1.13 1999/01/11 17:45:22 eivind Exp $
*/
/*
* Portions of this driver taken from the original FreeBSD cd driver.
@@ -964,7 +964,7 @@ cdopen(dev_t dev, int flags, int fmt, struct proc *p)
/* Initialize slice tables. */
error = dsopen("cd", dev, fmt, DSO_NOLABELS | DSO_ONESLICE,
- &softc->cd_slices, &label, cdstrategy,
+ &softc->cd_slices, &label, cdstrategy1,
(ds_setgeom_t *)NULL, &cd_cdevsw);
if (error == 0) {
@@ -2486,7 +2486,7 @@ cdioctl(dev_t dev, u_long cmd, caddr_t addr, int flag, struct proc *p)
* don't, dsioctl will pass back an error code of ENOIOCTL.
*/
error = dsioctl("cd", dev, cmd, addr, flag, &softc->cd_slices,
- cdstrategy, (ds_setgeom_t *)NULL);
+ cdstrategy1, (ds_setgeom_t *)NULL);
if (error != ENOIOCTL)
break;
OpenPOWER on IntegriCloud