FBSD, DFBSD (future) vnode_pager_setsize updates

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

diff --git a/src/afs/FBSD/osi_misc.c b/src/afs/FBSD/osi_misc.c
index 2b6ac48..6c2876d 100644 (file)
--- a/src/afs/FBSD/osi_misc.c
+++ b/src/afs/FBSD/osi_misc.c
@@ -10,8 +10,6 @@
 /* 
  * osi_misc.c
  *
- * Implements:
- * afs_suser
  */
 
 #include <afsconfig.h>
@@ -22,12 +20,6 @@
 #include "afsincludes.h"       /* Afs-based standard headers */
 #include <sys/namei.h>
 
-#ifdef AFS_FBSD50_ENV
-/* serious cheating */
-#undef curproc
-#define curproc curthread
-#endif
-
 int
 osi_lookupname(char *aname, enum uio_seg seg, int followlink,
               struct vnode **vpp)
@@ -35,11 +27,9 @@ osi_lookupname(char *aname, enum uio_seg seg, int followlink,
     struct nameidata n;
     int flags, error, glocked;
 
-#ifdef AFS_FBSD50_ENV
     glocked = ISAFS_GLOCK();
     if (glocked)
        AFS_GUNLOCK();
-#endif
 
     flags = 0;
     flags = LOCKLEAF;
@@ -50,28 +40,22 @@ osi_lookupname(char *aname, enum uio_seg seg, int followlink,
 #ifdef AFS_FBSD80_ENV
     flags |= MPSAFE; /* namei must take GIANT if needed */
 #endif
-    NDINIT(&n, LOOKUP, flags, seg, aname, curproc);
+    NDINIT(&n, LOOKUP, flags, seg, aname, curthread);
     if ((error = namei(&n)) != 0) {
-#ifdef AFS_FBSD50_ENV
        if (glocked)
            AFS_GLOCK();
-#endif
        return error;
     }
     *vpp = n.ni_vp;
     /* XXX should we do this?  Usually NOT (matt) */
 #if defined(AFS_FBSD80_ENV)
     /*VOP_UNLOCK(n.ni_vp, 0);*/
-#elif defined(AFS_FBSD50_ENV)
-    VOP_UNLOCK(n.ni_vp, 0, curthread);
 #else
-    VOP_UNLOCK(n.ni_vp, 0, curproc);
+    VOP_UNLOCK(n.ni_vp, 0, curthread);
 #endif
     NDFREE(&n, NDF_ONLY_PNBUF);
-#ifdef AFS_FBSD50_ENV
     if (glocked)
        AFS_GLOCK();
-#endif
     return 0;
 }
 
@@ -81,27 +65,7 @@ osi_lookupname(char *aname, enum uio_seg seg, int followlink,
 void
 afs_osi_SetTime(osi_timeval_t * atv)
 {
-#ifdef AFS_FBSD50_ENV
     printf("afs attempted to set clock; use \"afsd -nosettime\"\n");
-#else
-    struct timespec ts;
-    struct timeval tv, delta;
-    int s;
-
-    AFS_GUNLOCK();
-    s = splclock();
-    microtime(&tv);
-    delta = *atv;
-    timevalsub(&delta, &tv);
-    ts.tv_sec = atv->tv_sec;
-    ts.tv_nsec = atv->tv_usec * 1000;
-    set_timecounter(&ts);
-    (void)splsoftclock();
-    lease_updatetime(delta.tv_sec);
-    splx(s);
-    resettodr();
-    AFS_GLOCK();
-#endif
 }
 
 /*
@@ -111,7 +75,6 @@ void *
 osi_fbsd_alloc(size_t size, int dropglobal)
 {
        void *rv;
-#ifdef AFS_FBSD50_ENV
        int glocked;
 
        if (dropglobal) {
@@ -122,7 +85,6 @@ osi_fbsd_alloc(size_t size, int dropglobal)
            if (glocked)
                AFS_GLOCK();
        } else
-#endif
            rv = malloc(size, M_AFS, M_NOWAIT);
 
        return (rv);