diff options
| author | Jeff Roberson <jeff@FreeBSD.org> | 2002-08-04 10:29:36 +0000 |
|---|---|---|
| committer | Jeff Roberson <jeff@FreeBSD.org> | 2002-08-04 10:29:36 +0000 |
| commit | e6e370a7fe930e04cec38bcc2e06be127ed7ee02 (patch) | |
| tree | e889f56910bf98cbee3be239655a9e4bbb928b2e /sys/nfsclient | |
| parent | f75bb0aa25847511ed461bccb4d3fc247ab6b1d5 (diff) | |
Notes
Diffstat (limited to 'sys/nfsclient')
| -rw-r--r-- | sys/nfsclient/nfs_bio.c | 9 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vfsops.c | 5 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_vnops.c | 6 |
3 files changed, 14 insertions, 6 deletions
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index 685c6d19160f..d8243ae917dc 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -1063,9 +1063,13 @@ nfs_vinvalbuf(struct vnode *vp, int flags, struct ucred *cred, struct nfsmount *nmp = VFSTONFS(vp->v_mount); int error = 0, slpflag, slptimeo; - if (vp->v_flag & VXLOCK) { + VI_LOCK(vp); + if (vp->v_iflag & VI_XLOCK) { + /* XXX Should we wait here? */ + VI_UNLOCK(vp); return (0); } + VI_UNLOCK(vp); if ((nmp->nm_flag & NFSMNT_INT) == 0) intrflg = 0; @@ -1340,7 +1344,8 @@ nfs_doio(struct buf *bp, struct ucred *cr, struct thread *td) uiop->uio_resid = 0; } } - if (p && (vp->v_flag & VTEXT) && + mp_fixme("Accessing VV_TEXT without a lock."); + if (p && (vp->v_vflag & VV_TEXT) && (np->n_mtime != np->n_vattr.va_mtime.tv_sec)) { uprintf("Process killed due to text file modification\n"); PROC_LOCK(p); diff --git a/sys/nfsclient/nfs_vfsops.c b/sys/nfsclient/nfs_vfsops.c index 45ad21815bb6..4ac930e59014 100644 --- a/sys/nfsclient/nfs_vfsops.c +++ b/sys/nfsclient/nfs_vfsops.c @@ -505,7 +505,8 @@ nfs_mountroot(struct mount *mp, struct thread *td) * hack it to a regular file. */ vp->v_type = VREG; - vp->v_flag = 0; + vp->v_vflag = 0; + vp->v_iflag = 0; VREF(vp); swaponvp(td, vp, NODEV, nd->swap_nblks); } @@ -951,7 +952,7 @@ nfs_root(struct mount *mp, struct vnode **vpp) vp = NFSTOV(np); if (vp->v_type == VNON) vp->v_type = VDIR; - vp->v_flag = VROOT; + vp->v_vflag |= VV_ROOT; *vpp = vp; return (0); } diff --git a/sys/nfsclient/nfs_vnops.c b/sys/nfsclient/nfs_vnops.c index a2aa645460ca..37b92646cd08 100644 --- a/sys/nfsclient/nfs_vnops.c +++ b/sys/nfsclient/nfs_vnops.c @@ -2807,9 +2807,10 @@ loop: goto again; } if (waitfor == MNT_WAIT) { + VI_LOCK(vp); while (vp->v_numoutput) { - vp->v_flag |= VBWAIT; - error = tsleep((caddr_t)&vp->v_numoutput, + vp->v_iflag |= VI_BWAIT; + error = msleep((caddr_t)&vp->v_numoutput, VI_MTX(vp), slpflag | (PRIBIO + 1), "nfsfsync", slptimeo); if (error) { if (nfs_sigintr(nmp, NULL, td)) { @@ -2822,6 +2823,7 @@ loop: } } } + VI_UNLOCK(vp); if (!TAILQ_EMPTY(&vp->v_dirtyblkhd) && commit) { goto loop; } |