diff options
| author | trasz <trasz@FreeBSD.org> | 2010-01-27 19:30:44 +0000 |
|---|---|---|
| committer | trasz <trasz@FreeBSD.org> | 2010-01-27 19:30:44 +0000 |
| commit | de024c24522ad2d0dcca9f50ddebac71cf469d4a (patch) | |
| tree | a4c400c0347fe997d9da4ef78bbbd0b778b8b377 | |
| parent | 186bb5641db701c8dace0eb1cbad70cd520ccd72 (diff) | |
| download | FreeBSD-src-de024c24522ad2d0dcca9f50ddebac71cf469d4a.zip FreeBSD-src-de024c24522ad2d0dcca9f50ddebac71cf469d4a.tar.gz | |
Don't touch v_interlock; use VI_* macros instead.
| -rw-r--r-- | sys/fs/nwfs/nwfs_node.c | 2 | ||||
| -rw-r--r-- | sys/fs/nwfs/nwfs_vnops.c | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sys/fs/nwfs/nwfs_node.c b/sys/fs/nwfs/nwfs_node.c index 29ad71c..1e044c66 100644 --- a/sys/fs/nwfs/nwfs_node.c +++ b/sys/fs/nwfs/nwfs_node.c @@ -151,7 +151,7 @@ loop: rescan: if (nwfs_hashlookup(nmp, fid, &np) == 0) { vp = NWTOV(np); - mtx_lock(&vp->v_interlock); + VI_LOCK(vp); sx_xunlock(&nwhashlock); if (vget(vp, LK_EXCLUSIVE | LK_INTERLOCK, curthread)) goto loop; diff --git a/sys/fs/nwfs/nwfs_vnops.c b/sys/fs/nwfs/nwfs_vnops.c index 7ed5d85..e63df80 100644 --- a/sys/fs/nwfs/nwfs_vnops.c +++ b/sys/fs/nwfs/nwfs_vnops.c @@ -231,24 +231,24 @@ nwfs_close(ap) if (vp->v_type == VDIR) return 0; /* nothing to do now */ error = 0; - mtx_lock(&vp->v_interlock); + VI_LOCK(vp); if (np->opened == 0) { - mtx_unlock(&vp->v_interlock); + VI_UNLOCK(vp); return 0; } - mtx_unlock(&vp->v_interlock); + VI_UNLOCK(vp); error = nwfs_vinvalbuf(vp, ap->a_td); - mtx_lock(&vp->v_interlock); + VI_LOCK(vp); if (np->opened == 0) { - mtx_unlock(&vp->v_interlock); + VI_UNLOCK(vp); return 0; } if (--np->opened == 0) { - mtx_unlock(&vp->v_interlock); + VI_UNLOCK(vp); error = ncp_close_file(NWFSTOCONN(VTONWFS(vp)), &np->n_fh, ap->a_td, ap->a_cred); } else - mtx_unlock(&vp->v_interlock); + VI_UNLOCK(vp); np->n_atime = 0; return (error); } |
