Bring FBSD 7.X client back to life

[openafs.git] / src / afs / FBSD / osi_machdep.h

diff --git a/src/afs/FBSD/osi_machdep.h b/src/afs/FBSD/osi_machdep.h
index 5bc4454..2865120 100644 (file)
--- a/src/afs/FBSD/osi_machdep.h
+++ b/src/afs/FBSD/osi_machdep.h
@@ -41,8 +41,10 @@ typedef struct proc afs_proc_t;
 #define iodone biodone
 #endif
 
+#ifdef AFS_FBSD80_ENV
 #define VSUID           S_ISUID
 #define VSGID           S_ISGID
+#endif
 
 #define osi_vnhold(avc,r)      vref(AFSTOV(avc))
 
@@ -79,7 +81,6 @@ extern int (**afs_vnodeop_p) ();
 extern void *osi_fbsd_alloc(size_t size, int dropglobal);
 extern void osi_fbsd_free(void *p);
 
-#undef afs_osi_Alloc_NoSleep
 #define afs_osi_Alloc_NoSleep(size) osi_fbsd_alloc((size), 0)
 
 #ifdef AFS_FBSD80_ENV
@@ -144,11 +145,11 @@ extern struct thread *afs_global_owner;
 # endif
 
 #undef SPLVAR
-#define SPLVAR int splvar
+#define SPLVAR
 #undef NETPRI
-#define NETPRI splvar=splnet()
+#define NETPRI
 #undef USERPRI
-#define USERPRI splx(splvar)
+#define USERPRI
 
 #define osi_procname(procname, size) strncpy(procname, curproc->p_comm, size)