diff options
| author | kib <kib@FreeBSD.org> | 2006-07-12 09:16:35 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2006-07-12 09:16:35 +0000 |
| commit | ace4b931ad30c5bfe3782d7919a80511a680a883 (patch) | |
| tree | 41381070a4085a02cf18e739469ee967118baa4a /sys/nfs4client | |
| parent | 41c3c00a6d377b7fc3882b639b295eb753b16cc8 (diff) | |
| download | FreeBSD-src-ace4b931ad30c5bfe3782d7919a80511a680a883.zip FreeBSD-src-ace4b931ad30c5bfe3782d7919a80511a680a883.tar.gz | |
Always supply curthread as argument to nfs_asyncio and nfs_doio
in nfs_strategy. Otherwise, for some buffers, signals would be ignored
at the intr mounts.
Reviewed by: mohan, cel
MFC after: 1 month
Approved by: pjd (mentor)
Diffstat (limited to 'sys/nfs4client')
| -rw-r--r-- | sys/nfs4client/nfs4_vnops.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/sys/nfs4client/nfs4_vnops.c b/sys/nfs4client/nfs4_vnops.c index 6ab5d2e..f0e920e 100644 --- a/sys/nfs4client/nfs4_vnops.c +++ b/sys/nfs4client/nfs4_vnops.c @@ -2444,17 +2444,11 @@ nfs4_strategy(struct vop_strategy_args *ap) { struct buf *bp = ap->a_bp; struct ucred *cr; - struct thread *td; int error = 0; 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)); - if (bp->b_flags & B_ASYNC) - td = NULL; - else - td = curthread; /* XXX */ - if (bp->b_iocmd == BIO_READ) cr = bp->b_rcred; else @@ -2466,8 +2460,8 @@ nfs4_strategy(struct vop_strategy_args *ap) * otherwise just do it ourselves. */ if ((bp->b_flags & B_ASYNC) == 0 || - nfs_asyncio(VFSTONFS(ap->a_vp->v_mount), bp, NOCRED, td)) - error = nfs_doio(ap->a_vp, bp, cr, td); + nfs_asyncio(VFSTONFS(ap->a_vp->v_mount), bp, NOCRED, curthread)) + error = nfs_doio(ap->a_vp, bp, cr, curthread); return (error); } |
