]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
Build fix for recent FreeBSD -current
authorBenjamin Kaduk <kaduk@mit.edu>
Thu, 30 Oct 2014 23:51:29 +0000 (19:51 -0400)
committerStephan Wiesand <stephan.wiesand@desy.de>
Wed, 26 Nov 2014 15:25:39 +0000 (10:25 -0500)
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 <kaduk@mit.edu>
Reviewed-by: D Brashear <shadow@your-file-system.com>
(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 <buildbot@rampaginggeek.com>
Reviewed-by: D Brashear <shadow@your-file-system.com>
Reviewed-by: Benjamin Kaduk <kaduk@mit.edu>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
src/afs/FBSD/osi_vfsops.c

index 5de249b63608eddae96e67ef4a5db9349c4d011a..5d3cb7a2cad8cc982bc0a02ef447c0d68932a552 100644 (file)
@@ -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;