freebsd: CM changes targeting RELENG_8

[openafs.git] / src / afs / FBSD / osi_vnodeops.c

diff --git a/src/afs/FBSD/osi_vnodeops.c b/src/afs/FBSD/osi_vnodeops.c
index 442215c..4842e96 100644 (file)
--- a/src/afs/FBSD/osi_vnodeops.c
+++ b/src/afs/FBSD/osi_vnodeops.c
@@ -93,7 +93,7 @@ static vop_setattr_t  afs_vop_setattr;
 static vop_strategy_t  afs_vop_strategy;
 static vop_symlink_t   afs_vop_symlink;
 static vop_write_t     afs_vop_write;
-#if defined(AFS_FBSD70_ENV) && !defined(AFS_FBSD90_ENV)
+#if defined(AFS_FBSD70_ENV) && !defined(AFS_FBSD80_ENV)
 static vop_lock1_t      afs_vop_lock;
 static vop_unlock_t     afs_vop_unlock;
 static vop_islocked_t   afs_vop_islocked;
@@ -134,7 +134,7 @@ struct vop_vector afs_vnodeops = {
        .vop_strategy =         afs_vop_strategy,
        .vop_symlink =          afs_vop_symlink,
        .vop_write =            afs_vop_write,
-#if defined(AFS_FBSD70_ENV) && !defined(AFS_FBSD90_ENV)
+#if defined(AFS_FBSD70_ENV) && !defined(AFS_FBSD80_ENV)
        .vop_lock1 =            afs_vop_lock,
        .vop_unlock =           afs_vop_unlock,
        .vop_islocked =         afs_vop_islocked,
@@ -1516,15 +1516,11 @@ afs_vop_reclaim(struct vop_reclaim_args *ap)
      */
     if (code)
        printf("afs_vop_reclaim: afs_FlushVCache failed code %d\n", code);
-#ifdef AFS_FBSD60_ENV
-    else {
-       vnode_destroy_vobject(vp);
-#ifndef AFS_FBSD70_ENV
-       vfs_hash_remove(vp);
-#endif
-       vp->v_data = 0;
-    }
-#endif
+
+    /* basically, it must not fail */
+    vnode_destroy_vobject(vp);
+    vp->v_data = 0;
+
     return 0;
 }
 
@@ -1578,17 +1574,10 @@ afs_vop_print(ap)
     register struct vcache *vc = VTOAFS(ap->a_vp);
     int s = vc->f.states;
 
-#ifdef AFS_FBSD50_ENV
-    printf("tag %s, fid: %d.%x.%x.%x, opens %d, writers %d", vp->v_tag,
+    printf("tag %s, fid: %d.%d.%d.%d, opens %d, writers %d", vp->v_tag,
           (int)vc->f.fid.Cell, (u_int) vc->f.fid.Fid.Volume,
           (u_int) vc->f.fid.Fid.Vnode, (u_int) vc->f.fid.Fid.Unique, vc->opens,
           vc->execsOrWriters);
-#else
-    printf("tag %d, fid: %ld.%x.%x.%x, opens %d, writers %d", vp->v_tag,
-          vc->f.fid.Cell, (u_int) vc->f.fid.Fid.Volume,
-          (u_int) vc->f.fid.Fid.Vnode, (u_int) vc->f.fid.Fid.Unique, vc->opens,
-          vc->execsOrWriters);
-#endif
     printf("\n  states%s%s%s%s%s", (s & CStatd) ? " statd" : "",
           (s & CRO) ? " readonly" : "", (s & CDirty) ? " dirty" : "",
           (s & CMAPPED) ? " mapped" : "",