summaryrefslogtreecommitdiff
path: root/sys/dev/ccd.c
diff options
context:
space:
mode:
authorhannken <hannken@NetBSD.org>2004-01-25 18:06:48 +0000
committerhannken <hannken@NetBSD.org>2004-01-25 18:06:48 +0000
commit3db4e2acd8e5eada26b08616d608d82fc4af74a0 (patch)
tree1b03b5d463d3843c9d4fd5aabc3aff9b93dd232b /sys/dev/ccd.c
parentd7f6cbf8bcfc796c13c751a3bcda9e4ce70cb790 (diff)
Make VOP_STRATEGY(bp) a real VOP as discussed on tech-kern.
VOP_STRATEGY(bp) is replaced by one of two new functions: - VOP_STRATEGY(vp, bp) Call the strategy routine of vp for bp. - DEV_STRATEGY(bp) Call the d_strategy routine of bp->b_dev for bp. DEV_STRATEGY(bp) is used only for block-to-block device situations.
Diffstat (limited to 'sys/dev/ccd.c')
-rw-r--r--sys/dev/ccd.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/ccd.c b/sys/dev/ccd.c
index 2d63130abe6..abbf9a2a404 100644
--- a/sys/dev/ccd.c
+++ b/sys/dev/ccd.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ccd.c,v 1.94 2004/01/10 14:39:50 yamt Exp $ */
+/* $NetBSD: ccd.c,v 1.95 2004/01/25 18:06:48 hannken Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 1999 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.94 2004/01/10 14:39:50 yamt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ccd.c,v 1.95 2004/01/25 18:06:48 hannken Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -772,7 +772,7 @@ ccdstart(cs)
SIMPLEQ_REMOVE_HEAD(&cbufq, cb_q);
if ((cbp->cb_buf.b_flags & B_READ) == 0)
cbp->cb_buf.b_vp->v_numoutput++;
- VOP_STRATEGY(&cbp->cb_buf);
+ DEV_STRATEGY(&cbp->cb_buf);
}
}
}
@@ -853,7 +853,7 @@ ccdbuffer(cs, bp, bn, addr, bcount)
cbp->cb_buf.b_flags = bp->b_flags | B_CALL;
cbp->cb_buf.b_iodone = ccdiodone;
cbp->cb_buf.b_proc = bp->b_proc;
- cbp->cb_buf.b_dev = ci->ci_dev; /* XXX */
+ cbp->cb_buf.b_dev = ci->ci_dev;
cbp->cb_buf.b_blkno = cbn + cboff;
cbp->cb_buf.b_data = addr;
cbp->cb_buf.b_vp = ci->ci_vp;