diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/vnd.c | 41 |
1 files changed, 1 insertions, 40 deletions
diff --git a/sys/dev/vnd.c b/sys/dev/vnd.c index 0e3db970b49..b856656ac12 100644 --- a/sys/dev/vnd.c +++ b/sys/dev/vnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: vnd.c,v 1.112 2011/04/23 17:01:04 jsing Exp $ */ +/* $OpenBSD: vnd.c,v 1.113 2011/04/23 22:00:09 miod Exp $ */ /* $NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $ */ /* @@ -139,7 +139,6 @@ void vndattach(int); void vndclear(struct vnd_softc *); int vndsetcred(struct vnd_softc *, struct ucred *); -void vndiodone(struct buf *); void vndshutdown(void); int vndgetdisklabel(dev_t, struct vnd_softc *, struct disklabel *, int); void vndencrypt(struct vnd_softc *, caddr_t, size_t, daddr64_t, int); @@ -429,44 +428,6 @@ vndstrategy(struct buf *bp) } -void -vndiodone(struct buf *bp) -{ - struct vndbuf *vbp = (struct vndbuf *) bp; - struct buf *pbp = vbp->vb_obp; - struct vnd_softc *vnd = &vnd_softc[vndunit(pbp->b_dev)]; - - splassert(IPL_BIO); - - DNPRINTF(VDB_IO, - "vndiodone(%d): vbp %p vp %p blkno %lld addr %p cnt %lx\n", - vnd-vnd_softc, vbp, vbp->vb_buf.b_vp, vbp->vb_buf.b_blkno, - vbp->vb_buf.b_data, vbp->vb_buf.b_bcount); - - if (vbp->vb_buf.b_error) { - DNPRINTF(VDB_IO, "vndiodone: vbp %p error %d\n", vbp, - vbp->vb_buf.b_error); - - pbp->b_flags |= (B_ERROR|B_INVAL); - pbp->b_error = vbp->vb_buf.b_error; - pbp->b_iodone = NULL; - biodone(pbp); - goto out; - } - - pbp->b_resid -= vbp->vb_buf.b_bcount; - - if (pbp->b_resid == 0) { - DNPRINTF(VDB_IO, "vndiodone: pbp %p iodone\n", pbp); - biodone(pbp); - } - -out: - putvndbuf(vbp); - disk_unbusy(&vnd->sc_dk, (pbp->b_bcount - pbp->b_resid), - (pbp->b_flags & B_READ)); -} - /* ARGSUSED */ int vndread(dev_t dev, struct uio *uio, int flags) |