diff options
| author | rmacklem <rmacklem@FreeBSD.org> | 2009-07-22 14:37:53 +0000 |
|---|---|---|
| committer | rmacklem <rmacklem@FreeBSD.org> | 2009-07-22 14:37:53 +0000 |
| commit | d00a1eab14e44b3e8b2d398cc1519dba8aa5ee68 (patch) | |
| tree | dacfdbfef58f66fcadc2d2fc68ace7ef9e61938e /sys/fs/nfsclient/nfs_clbio.c | |
| parent | f8feb430b0a4639f63593e2ba2bb08a7aeae8ff8 (diff) | |
| download | FreeBSD-src-d00a1eab14e44b3e8b2d398cc1519dba8aa5ee68.zip FreeBSD-src-d00a1eab14e44b3e8b2d398cc1519dba8aa5ee68.tar.gz | |
Add changes to the experimental nfs client to use the PBDRY flag for
msleep(9) when a vnode lock or similar may be held. The changes are
just a clone of the changes applied to the regular nfs client by
r195703.
Approved by: re (kensmith), kib (mentor)
Diffstat (limited to 'sys/fs/nfsclient/nfs_clbio.c')
| -rw-r--r-- | sys/fs/nfsclient/nfs_clbio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c index 1e7785b..030e322 100644 --- a/sys/fs/nfsclient/nfs_clbio.c +++ b/sys/fs/nfsclient/nfs_clbio.c @@ -1357,7 +1357,7 @@ nfs_getcacheblk(struct vnode *vp, daddr_t bn, int size, struct thread *td) sigset_t oldset; ncl_set_sigmask(td, &oldset); - bp = getblk(vp, bn, size, PCATCH, 0, 0); + bp = getblk(vp, bn, size, NFS_PCATCH, 0, 0); ncl_restore_sigmask(td, &oldset); while (bp == NULL) { if (newnfs_sigintr(nmp, td)) @@ -1396,7 +1396,7 @@ ncl_vinvalbuf(struct vnode *vp, int flags, struct thread *td, int intrflg) if ((nmp->nm_mountp->mnt_kern_flag & MNTK_UNMOUNTF)) intrflg = 1; if (intrflg) { - slpflag = PCATCH; + slpflag = NFS_PCATCH; slptimeo = 2 * hz; } else { slpflag = 0; @@ -1484,7 +1484,7 @@ ncl_asyncio(struct nfsmount *nmp, struct buf *bp, struct ucred *cred, struct thr } again: if (nmp->nm_flag & NFSMNT_INT) - slpflag = PCATCH; + slpflag = NFS_PCATCH; gotiod = FALSE; /* @@ -1553,7 +1553,7 @@ again: mtx_unlock(&ncl_iod_mutex); return (error2); } - if (slpflag == PCATCH) { + if (slpflag == NFS_PCATCH) { slpflag = 0; slptimeo = 2 * hz; } |
