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 bcc123937669cfb31ea89ef345689b22d8fbae51..f908c700591bbd5453d4bdec68e22eb592bc5c93 100644 (file)
--- 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 5413cf6f7edb4320140c2120407fc1331531a9ad..60abcbb94e912db586a8836fbbe16015f51b9d3e 100644 (file)
--- 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);