From: Jim Rees <rees@umich.edu>
Date: Tue, 18 Jan 2005 16:15:36 +0000 (+0000)
Subject: obsd-cleanups-20040118
X-Git-Tag: BP-disconnected~40
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5f498279b827675a48c80b7c2f43c78d8e41d406;p=packages%2Fo%2Fopenafs.git

obsd-cleanups-20040118


remove dead code
add (commented out, non-working) new reclaim code
---

diff --git a/src/afs/OBSD/osi_sleep.c b/src/afs/OBSD/osi_sleep.c
index 5fd1c0e3c..4e6b77edb 100644
--- a/src/afs/OBSD/osi_sleep.c
+++ b/src/afs/OBSD/osi_sleep.c
@@ -54,13 +54,6 @@ RCSID
 static char waitV;
 
 
-void
-afs_osi_InitWaitHandle(struct afs_osi_WaitHandle *achandle)
-{
-    AFS_STATCNT(osi_InitWaitHandle);
-    achandle->proc = NULL;
-}
-
 /* cancel osi_Wait */
 void
 afs_osi_CancelWait(struct afs_osi_WaitHandle *achandle)
diff --git a/src/afs/OBSD/osi_vnodeops.c b/src/afs/OBSD/osi_vnodeops.c
index c4b38ea98..426d4f436 100644
--- a/src/afs/OBSD/osi_vnodeops.c
+++ b/src/afs/OBSD/osi_vnodeops.c
@@ -894,6 +894,14 @@ afs_nbsd_reclaim(void *v)
     int haveGlock = ISAFS_GLOCK();
     int haveVlock = CheckLock(&afs_xvcache);
 
+#if 0
+    printf("reclaim usecount %d\n", vp->v_usecount);
+    /* OK, there are no internal vrefCounts, so there shouldn't
+     * be any more refs here. */
+    vp->v_data = NULL;		/* remove from vnode */
+    avc->v = NULL;		/* also drop the ptr to vnode */
+    return 0;
+#else
     if (!haveGlock)
 	AFS_GLOCK();
     if (!haveVlock)
@@ -909,6 +917,7 @@ afs_nbsd_reclaim(void *v)
     if (!haveGlock)
 	AFS_GUNLOCK();
     return code;
+#endif
 }
 
 int