From: Derrick Brashear <shadow@dementia.org>
Date: Sat, 26 Mar 2005 05:37:42 +0000 (+0000)
Subject: darwin-vnode-macros-20050325
X-Git-Tag: openafs-devel-1_5_0~695
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=79703698011d196616561072b6c531ad0a4f8c68;p=packages%2Fo%2Fopenafs.git

darwin-vnode-macros-20050325


use vnode to vcache conversion macros
---

diff --git a/src/afs/DARWIN/osi_vm.c b/src/afs/DARWIN/osi_vm.c
index bcc123937..f908c7005 100644
--- a/src/afs/DARWIN/osi_vm.c
+++ b/src/afs/DARWIN/osi_vm.c
@@ -404,7 +404,7 @@ osi_VM_Setup(struct vcache *avc, int force)
 	    if ((error = ubc_info_init(&avc->v))) {
 		AFS_GLOCK();
 		avc->states &= ~CUBCinit;
-		AFS_RELE(avc);
+		AFS_RELE(AFSTOV(avc));
 		return error;
 	    }
 #ifndef AFS_DARWIN14_ENV
@@ -421,7 +421,7 @@ osi_VM_Setup(struct vcache *avc, int force)
 #endif
 	    AFS_GLOCK();
 	    avc->states &= ~CUBCinit;
-	    AFS_RELE(avc);
+	    AFS_RELE(AFSTOV(avc));
 	}
 	if (UBCINFOEXISTS(&avc->v))
 	    ubc_setsize(&avc->v, avc->m.Length);
diff --git a/src/afs/DARWIN/osi_vnodeops.c b/src/afs/DARWIN/osi_vnodeops.c
index 5413cf6f7..60abcbb94 100644
--- a/src/afs/DARWIN/osi_vnodeops.c
+++ b/src/afs/DARWIN/osi_vnodeops.c
@@ -352,7 +352,8 @@ afs_vop_close(ap)
 				 * } */ *ap;
 {
     int code;
-    struct vcache *avc = ap->a_vp;
+    struct vnode *vp = ap->a_vp;
+    struct vcache *avc = VTOAFS(vp);
     AFS_GLOCK();
     if (ap->a_cred)
 	code = afs_close(avc, ap->a_fflag, ap->a_cred, ap->a_p);