X-Git-Url: https://git.openafs.org/?p=openafs.git;a=blobdiff_plain;f=src%2Fafs%2FVNOPS%2Fafs_vnop_remove.c;h=b5f53b498bb6c586b2d4a3a0e10f3b78b3fdf614;hp=f1bf408d291e93b6e7b697e98c3011f4cd84b759;hb=a19728ba55f30a41799855b49c5cf6c07c840f87;hpb=65cffcadb96389ff3e794eb822d2231220c71160

diff --git a/src/afs/VNOPS/afs_vnop_remove.c b/src/afs/VNOPS/afs_vnop_remove.c
index f1bf408..b5f53b4 100644
--- a/src/afs/VNOPS/afs_vnop_remove.c
+++ b/src/afs/VNOPS/afs_vnop_remove.c
@@ -346,10 +346,10 @@ afs_remove(OSI_VC_DECL(adp), char *aname, afs_ucred_t *acred)
 	code = afsrename(adp, aname, adp, unlname, acred, treq);
 	Tnam1 = unlname;
 	if (!code) {
-	    struct VenusFid *oldmvid = NULL;
-	    if (tvc->mvid) 
-		oldmvid = tvc->mvid;
-	    tvc->mvid = (struct VenusFid *)unlname;
+	    void *oldmvid = NULL;
+	    if (tvc->mvid.silly_name)
+		oldmvid = tvc->mvid.silly_name;
+	    tvc->mvid.silly_name = unlname;
 	    if (oldmvid)
 		osi_FreeSmallSpace(oldmvid);
 	    crhold(acred);
@@ -410,7 +410,7 @@ afs_remunlink(struct vcache *avc, int doit)
     }
 #endif
 
-    if (avc->mvid && (doit || (avc->f.states & CUnlinkedDel))) {
+    if (avc->mvid.silly_name && (doit || (avc->f.states & CUnlinkedDel))) {
 	struct vrequest *treq = NULL;
 
 	if ((code = afs_CreateReq(&treq, avc->uncred))) {
@@ -419,8 +419,8 @@ afs_remunlink(struct vcache *avc, int doit)
 	    /* Must bump the refCount because GetVCache may block.
 	     * Also clear mvid so no other thread comes here if we block.
 	     */
-	    unlname = (char *)avc->mvid;
-	    avc->mvid = NULL;
+	    unlname = avc->mvid.silly_name;
+	    avc->mvid.silly_name = NULL;
 	    cred = avc->uncred;
 	    avc->uncred = NULL;