venus: Remove dedebug

[openafs.git] / src / afs / IRIX / osi_vcache.c

diff --git a/src/afs/IRIX/osi_vcache.c b/src/afs/IRIX/osi_vcache.c
index e273aa5..51f6dae 100644 (file)
--- a/src/afs/IRIX/osi_vcache.c
+++ b/src/afs/IRIX/osi_vcache.c
@@ -14,7 +14,8 @@
 #include "afsincludes.h"        /*AFS-based standard headers */
 
 int
-osi_TryEvictVCache(struct vcache *avc, int *slept, int defersleep) {
+osi_TryEvictVCache(struct vcache *avc, int *slept, int defersleep)
+{
      int code;
      /* we can't control whether we sleep */
      if (!VREFCOUNT_GT(avc,0)
@@ -29,43 +30,42 @@ osi_TryEvictVCache(struct vcache *avc, int *slept, int defersleep) {
 extern char *makesname();
 
 struct vcache *
-osi_NewVnode(void) {
+osi_NewVnode(void)
+{
     struct vcache *avc;
     char name[METER_NAMSZ];
 
     avc = afs_osi_Alloc(sizeof(struct vcache));
+    if (avc == NULL) {
+       return NULL;
+    }
 
     memset(avc, 0, sizeof(struct vcache));
     avc->v.v_number = ++afsvnumbers;
     avc->vc_rwlockid = OSI_NO_LOCKID;
     initnsema(&avc->vc_rwlock, 1,
              makesname(name, "vrw", avc->v.v_number));
-#ifndef        AFS_SGI53_ENV
-    initnsema(&avc->v.v_sync, 0,
-             makesname(name, "vsy", avc->v.v_number));
-#endif
-#ifndef AFS_SGI62_ENV
-    initnlock(&avc->v.v_lock,
-             makesname(name, "vlk", avc->v.v_number));
-#endif
     return avc;
 }
 
 void
-osi_PrePopulateVCache(struct vcache *avc) {
+osi_PrePopulateVCache(struct vcache *avc)
+{
     avc->uncred = 0;
     memset(&(avc->f), 0, sizeof(struct fvcache));
 }
 
 void
-osi_AttachVnode(struct vcache *avc, int seq) { }
+osi_AttachVnode(struct vcache *avc, int seq)
+{
+}
 
 void
-osi_PostPopulateVCache(struct vcache *avc) {
+osi_PostPopulateVCache(struct vcache *avc)
+{
     memset(&(avc->vc_bhv_desc), 0, sizeof(avc->vc_bhv_desc));
     bhv_desc_init(&(avc->vc_bhv_desc), avc, avc, &Afs_vnodeops);
 
-#if defined(AFS_SGI65_ENV)
     vn_bhv_head_init(&(avc->v.v_bh), "afsvp");
     vn_bhv_insert_initial(&(avc->v.v_bh), &(avc->vc_bhv_desc));
     avc->v.v_mreg = avc->v.v_mregb = (struct pregion *)avc;
@@ -76,10 +76,6 @@ osi_PostPopulateVCache(struct vcache *avc) {
                 avc->v.v_number);
     init_mutex(&avc->v.v_filocksem, MUTEX_DEFAULT, "afsvfl", (long)avc);
     init_mutex(&avc->v.v_buf_lock, MUTEX_DEFAULT, "afsvnbuf", (long)avc);
-#else
-    bhv_head_init(&(avc->v.v_bh));
-    bhv_insert_initial(&(avc->v.v_bh), &(avc->vc_bhv_desc));
-#endif
 
     vnode_pcache_init(&avc->v);
 
@@ -102,15 +98,16 @@ osi_PostPopulateVCache(struct vcache *avc) {
     osi_Assert(avc->mapcnt == 0 && avc->vc_locktrips == 0);
     osi_Assert(avc->vc_rwlockid == OSI_NO_LOCKID);
     osi_Assert(avc->v.v_filocks == NULL);
-# if !defined(AFS_SGI65_ENV)
-    osi_Assert(avc->v.v_filocksem == NULL);
-# endif
     osi_Assert(avc->cred == NULL);
-# if defined(AFS_SGI64_ENV)
     vnode_pcache_reinit(&avc->v);
     avc->v.v_rdev = NODEV;
-# endif
     vn_initlist((struct vnlist *)&avc->v);
     avc->lastr = 0;
 }
 
+int
+osi_vnhold(struct vcache *avc)
+{
+    VN_HOLD(AFSTOV(avc));
+    return 0;
+}