afs: Refactor osi_vnhold/AFS_FAST_HOLD

[openafs.git] / src / afs / VNOPS / afs_vnop_lookup.c

diff --git a/src/afs/VNOPS/afs_vnop_lookup.c b/src/afs/VNOPS/afs_vnop_lookup.c
index c53360a..a0da07d 100644 (file)
--- a/src/afs/VNOPS/afs_vnop_lookup.c
+++ b/src/afs/VNOPS/afs_vnop_lookup.c
@@ -1094,7 +1094,9 @@ afs_DoBulkStat(struct vcache *adp, long dirCookie, struct vrequest *areqp)
        retry = 1;
     }
 #else
-    osi_vnhold(lruvcp, &retry);
+    if (osi_vnhold(lruvcp) != 0) {
+       retry = 1;
+    }
 #endif
     ReleaseReadLock(&afs_xvcache);     /* could be read lock */
     if (retry)
@@ -1473,7 +1475,11 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr
      */
     if (osi_lookup_isdot(aname)) {     /* special case */
        ObtainReadLock(&afs_xvcache);
-       osi_vnhold(adp, 0);
+       if (osi_vnhold(adp) != 0) {
+           ReleaseReadLock(&afs_xvcache);
+           code = EIO;
+           goto done;
+       }
        ReleaseReadLock(&afs_xvcache);
 #ifdef AFS_DARWIN80_ENV
         vnode_get(AFSTOV(adp));
@@ -1495,7 +1501,11 @@ afs_lookup(OSI_VC_DECL(adp), char *aname, struct vcache **avcp, afs_ucred_t *acr
        aname[0] == '.' && aname[1] == '.' && !aname[2]) {
 
        ObtainReadLock(&afs_xvcache);
-       osi_vnhold(afs_globalVp, 0);
+       if (osi_vnhold(afs_globalVp) != 0) {
+           ReleaseReadLock(&afs_xvcache);
+           code = EIO;
+           goto done;
+       }
        ReleaseReadLock(&afs_xvcache);
 #ifdef AFS_DARWIN80_ENV
         vnode_get(AFSTOV(afs_globalVp));