diff options
Diffstat (limited to 'sys/coda')
| -rw-r--r-- | sys/coda/coda_namecache.c | 3 | ||||
| -rw-r--r-- | sys/coda/coda_subr.c | 6 | ||||
| -rw-r--r-- | sys/coda/coda_vfsops.c | 5 |
3 files changed, 9 insertions, 5 deletions
diff --git a/sys/coda/coda_namecache.c b/sys/coda/coda_namecache.c index 97e5b2e..f2d4940 100644 --- a/sys/coda/coda_namecache.c +++ b/sys/coda/coda_namecache.c @@ -613,7 +613,8 @@ coda_nc_flush(dcstat) } vrele(CTOV(cncp->dcp)); - if (CTOV(cncp->cp)->v_flag & VTEXT) { + ASSERT_VOP_LOCKED(CTOV(cnp->cp), "coda_nc_flush"); + if (CTOV(cncp->cp)->v_vflag & VV_TEXT) { if (coda_vmflush(cncp->cp)) CODADEBUG(CODA_FLUSH, myprintf(("coda_nc_flush: (%lx.%lx.%lx) busy\n", cncp->cp->c_fid.Volume, cncp->cp->c_fid.Vnode, cncp->cp->c_fid.Unique)); ) diff --git a/sys/coda/coda_subr.c b/sys/coda/coda_subr.c index 571f9ca..8afe57d 100644 --- a/sys/coda/coda_subr.c +++ b/sys/coda/coda_subr.c @@ -413,7 +413,8 @@ int handleDownCall(opcode, out) vref(CTOV(cp)); cp->c_flags &= ~C_VATTR; - if (CTOV(cp)->v_flag & VTEXT) + ASSERT_VOP_LOCKED(CTOV(cp), "coda HandleDownCall"); + if (CTOV(cp)->v_vflag & VV_TEXT) error = coda_vmflush(cp); CODADEBUG(CODA_ZAPFILE, myprintf(( "zapfile: fid = (%lx.%lx.%lx), refcnt = %d, error = %d\n", @@ -470,8 +471,9 @@ int handleDownCall(opcode, out) } cp->c_flags &= ~C_VATTR; coda_nc_zapfid(&out->coda_purgefid.CodaFid, IS_DOWNCALL); + ASSERT_VOP_LOCKED(CTOV(cp), "coda HandleDownCall"); if (!(ODD(out->coda_purgefid.CodaFid.Vnode)) - && (CTOV(cp)->v_flag & VTEXT)) { + && (CTOV(cp)->v_vflag & VV_TEXT)) { error = coda_vmflush(cp); } diff --git a/sys/coda/coda_vfsops.c b/sys/coda/coda_vfsops.c index 33597d6..5040e68 100644 --- a/sys/coda/coda_vfsops.c +++ b/sys/coda/coda_vfsops.c @@ -192,7 +192,7 @@ coda_mount(vfsp, path, data, ndp, td) rootfid.Unique = 0; cp = make_coda_node(&rootfid, vfsp, VDIR); rootvp = CTOV(cp); - rootvp->v_flag |= VROOT; + rootvp->v_vflag |= VV_ROOT; ctlfid.Volume = CTL_VOL; ctlfid.Vnode = CTL_VNO; @@ -257,7 +257,8 @@ coda_unmount(vfsp, mntflags, td) vrele(mi->mi_rootvp); active = coda_kill(vfsp, NOT_DOWNCALL); - mi->mi_rootvp->v_flag &= ~VROOT; + ASSERT_VOP_LOCKED(mi->mi_rootvp, "coda_unmount"); + mi->mi_rootvp->v_vflag &= ~VV_ROOT; error = vflush(mi->mi_vfsp, 0, FORCECLOSE); printf("coda_unmount: active = %d, vflush active %d\n", active, error); error = 0; |
