diff options
| author | phk <phk@FreeBSD.org> | 2004-09-07 08:56:43 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 2004-09-07 08:56:43 +0000 |
| commit | 9f1a2f23b212c00fcbf88247ae9b3f80903955ce (patch) | |
| tree | d42741c35900a99444cf04b7e7fab7eebd821edf /sys/nfs4client | |
| parent | 766dd89a4b5b33be85a83493fb186af6a581812c (diff) | |
| download | FreeBSD-src-9f1a2f23b212c00fcbf88247ae9b3f80903955ce.zip FreeBSD-src-9f1a2f23b212c00fcbf88247ae9b3f80903955ce.tar.gz | |
Explicitly pass vnode to nfs_doio() and mountpoint to nfs_asyncio().
Diffstat (limited to 'sys/nfs4client')
| -rw-r--r-- | sys/nfs4client/nfs4_vnops.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/nfs4client/nfs4_vnops.c b/sys/nfs4client/nfs4_vnops.c index 75532a1..6754e05 100644 --- a/sys/nfs4client/nfs4_vnops.c +++ b/sys/nfs4client/nfs4_vnops.c @@ -2570,8 +2570,6 @@ nfs4_strategy(struct vop_strategy_args *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)); KASSERT(!(bp->b_flags & B_DONE), ("nfs4_strategy: buffer %p unexpectedly marked B_DONE", bp)); KASSERT(BUF_REFCNT(bp) > 0, ("nfs4_strategy: buffer %p not locked", bp)); @@ -2591,8 +2589,8 @@ nfs4_strategy(struct vop_strategy_args *ap) * otherwise just do it ourselves. */ if ((bp->b_flags & B_ASYNC) == 0 || - nfs_asyncio(bp, NOCRED, td)) - error = nfs_doio(bp, cr, td); + nfs_asyncio(VFSTONFS(ap->a_vp->v_mount), bp, NOCRED, td)) + error = nfs_doio(ap->a_vp, bp, cr, td); return (error); } |
