From e51d3b13c2b208efe72b584b532a28444633feff Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Thu, 30 Oct 2014 19:51:29 -0400 Subject: [PATCH] Build fix for recent FreeBSD -current r273707 added a flags argument to syscall_register(), so add the appropriate version check in param.generic_fbsd.h and ues that in the main code. Reviewed-on: http://gerrit.openafs.org/11565 Tested-by: Benjamin Kaduk Reviewed-by: D Brashear (cherry picked from commit f39dd54e11dff5e2b4da3eec419ae7c0825c210f) Note that the 1.6 branch does not have param.generic_fbsd.h, so the patch was modified for backport to just use AFS_FBSD110_ENV as the conditional. Change-Id: Id2934d83940caff4f64c2a7f2187b0eca5881c8f Reviewed-on: http://gerrit.openafs.org/11610 Tested-by: BuildBot Reviewed-by: D Brashear Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand --- src/afs/FBSD/osi_vfsops.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c index 5de249b63..5d3cb7a2c 100644 --- a/src/afs/FBSD/osi_vfsops.c +++ b/src/afs/FBSD/osi_vfsops.c @@ -49,7 +49,11 @@ afs_init(struct vfsconf *vfc) int code; int offset = AFS_SYSCALL; #if defined(AFS_FBSD90_ENV) || defined(AFS_FBSD82_ENV) +# if defined(AFS_FBSD_110_ENV) + code = syscall_register(&offset, &afs_sysent, &old_sysent, 0); +# else code = syscall_register(&offset, &afs_sysent, &old_sysent); +# endif if (code) { printf("AFS_SYSCALL in use, error %i. aborting\n", code); return code; -- 2.39.5