More FBSD syscall tweaking

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

diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c
index 3bed07b..d3e6c57 100644 (file)
--- a/src/afs/FBSD/osi_vfsops.c
+++ b/src/afs/FBSD/osi_vfsops.c
@@ -20,11 +20,14 @@ int afs_pbuf_freecnt = -1;
 extern int Afs_xsetgroups();
 extern int afs_xioctl();
 
+#if !defined(AFS_FBSD90_ENV) && !defined(AFS_FBSD82_ENV)
+static sy_call_t *old_handler;
+#else
 static struct sysent old_sysent;
 
 static struct sysent afs_sysent = {
     5,                 /* int sy_narg */
-    afs3_syscall,      /* sy_call_t *sy_call */
+    (sy_call_t *) afs3_syscall,        /* sy_call_t *sy_call */
 #ifdef AFS_FBSD60_ENV
     AUE_NULL,          /* au_event_t sy_auevent */
 #ifdef AFS_FBSD70_ENV
@@ -38,32 +41,51 @@ static struct sysent afs_sysent = {
 #endif
 #endif /* FBSD60 */
 };
+#endif /* FBSD90 */
 
 int
 afs_init(struct vfsconf *vfc)
 {
     int code;
     int offset = AFS_SYSCALL;
-
+#if defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV)
     code = syscall_register(&offset, &afs_sysent, &old_sysent);
     if (code) {
        printf("AFS_SYSCALL in use, error %i. aborting\n", code);
        return code;
     }
+#else
+    if (sysent[AFS_SYSCALL].sy_call != nosys
+        && sysent[AFS_SYSCALL].sy_call != lkmnosys) {
+        printf("AFS_SYSCALL in use. aborting\n");
+        return EBUSY;
+    }
+#endif
     osi_Init();
     afs_pbuf_freecnt = nswbuf / 2 + 1;
-
+#if !defined(AFS_FBSD90_ENV) && !defined(AFS_FBSD82_ENV)
+    old_handler = sysent[AFS_SYSCALL].sy_call;
+    sysent[AFS_SYSCALL].sy_call = afs3_syscall;
+    sysent[AFS_SYSCALL].sy_narg = 5;
+#endif
     return 0;
 }
 
 int
 afs_uninit(struct vfsconf *vfc)
 {
+#if defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV)
     int offset = AFS_SYSCALL;
+#endif
 
     if (afs_globalVFS)
        return EBUSY;
+#if defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV)
     syscall_deregister(&offset, &old_sysent);
+#else
+    sysent[AFS_SYSCALL].sy_narg = 0;
+    sysent[AFS_SYSCALL].sy_call = old_handler;
+#endif
     return 0;
 }