diff options
| -rw-r--r-- | sys/fs/nwfs/nwfs.h | 2 | ||||
| -rw-r--r-- | sys/fs/nwfs/nwfs_io.c | 5 | ||||
| -rw-r--r-- | sys/fs/nwfs/nwfs_vnops.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sys/fs/nwfs/nwfs.h b/sys/fs/nwfs/nwfs.h index 3d2a262..a8a9ad2 100644 --- a/sys/fs/nwfs/nwfs.h +++ b/sys/fs/nwfs/nwfs.h @@ -75,7 +75,7 @@ struct nwmount { int ncp_conn_logged_in(struct nwmount *); int nwfs_ioctl(struct vop_ioctl_args *ap); -int nwfs_doio(struct buf *bp, struct ucred *cr, struct thread *td); +int nwfs_doio(struct vnode *vp, struct buf *bp, struct ucred *cr, struct thread *td); int nwfs_vinvalbuf(struct vnode *vp, int flags, struct ucred *cred, struct thread *td, int intrflg); #endif /* _KERNEL */ diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c index 22f0e61..6b0d563 100644 --- a/sys/fs/nwfs/nwfs_io.c +++ b/sys/fs/nwfs/nwfs_io.c @@ -260,20 +260,19 @@ nwfs_writevnode(vp, uiop, cred, ioflag) * Do an I/O operation to/from a cache block. */ int -nwfs_doio(bp, cr, td) +nwfs_doio(vp, bp, cr, td) + struct vnode *vp; struct buf *bp; struct ucred *cr; struct thread *td; { struct uio *uiop; - struct vnode *vp; struct nwnode *np; struct nwmount *nmp; int error = 0; struct uio uio; struct iovec io; - vp = bp->b_vp; np = VTONW(vp); nmp = VFSTONWFS(vp->v_mount); uiop = &uio; diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c index 4215e63..d3c97f7 100644 --- a/sys/fs/nwfs/nwfs_vnops.c +++ b/sys/fs/nwfs/nwfs_vnops.c @@ -796,8 +796,6 @@ static int nwfs_strategy (ap) struct thread *td; int error = 0; - KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)", - __func__, ap->a_vp, ap->a_bp->b_vp)); NCPVNDEBUG("\n"); if (bp->b_flags & B_ASYNC) td = (struct thread *)0; @@ -813,7 +811,7 @@ static int nwfs_strategy (ap) * otherwise just do it ourselves. */ if ((bp->b_flags & B_ASYNC) == 0 ) - error = nwfs_doio(bp, cr, td); + error = nwfs_doio(ap->a_vp, bp, cr, td); return (error); } |
