diff options
| author | jhb <jhb@FreeBSD.org> | 2013-03-13 21:06:03 +0000 |
|---|---|---|
| committer | jhb <jhb@FreeBSD.org> | 2013-03-13 21:06:03 +0000 |
| commit | b2e811621c23b090f0a6428e112a67cbdb48769d (patch) | |
| tree | fa2ef41d7bc070ef5ac51a82695e8b8ed5cde34c /sys/fs/nfsclient/nfs_clvnops.c | |
| parent | 731061beabff7b87230da8252aed09e0a08701ea (diff) | |
| download | FreeBSD-src-b2e811621c23b090f0a6428e112a67cbdb48769d.zip FreeBSD-src-b2e811621c23b090f0a6428e112a67cbdb48769d.tar.gz | |
Revert 195703 and 195821 as this special stop handling in NFS is now
implemented via VFCF_SBDRY rather than passing PBDRY to individual
sleep calls.
Diffstat (limited to 'sys/fs/nfsclient/nfs_clvnops.c')
| -rw-r--r-- | sys/fs/nfsclient/nfs_clvnops.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/fs/nfsclient/nfs_clvnops.c b/sys/fs/nfsclient/nfs_clvnops.c index 2e105f8..4b52a05 100644 --- a/sys/fs/nfsclient/nfs_clvnops.c +++ b/sys/fs/nfsclient/nfs_clvnops.c @@ -2660,7 +2660,7 @@ ncl_flush(struct vnode *vp, int waitfor, struct ucred *cred, struct thread *td, if (called_from_renewthread != 0) slptimeo = hz; if (nmp->nm_flag & NFSMNT_INT) - slpflag = NFS_PCATCH; + slpflag = PCATCH; if (!commit) passone = 0; bo = &vp->v_bufobj; @@ -2866,7 +2866,7 @@ loop: error = EINTR; goto done; } - if (slpflag & PCATCH) { + if (slpflag == PCATCH) { slpflag = 0; slptimeo = 2 * hz; } @@ -2912,7 +2912,7 @@ loop: error = newnfs_sigintr(nmp, td); if (error) goto done; - if (slpflag & PCATCH) { + if (slpflag == PCATCH) { slpflag = 0; slptimeo = 2 * hz; } |
