]> git.michaelhowe.org Git - packages/o/openafs.git/commitdiff
Catch up to FreeBSD KPI for vfs_cmount
authorBen Kaduk <kaduk@mit.edu>
Fri, 11 Jan 2013 18:03:02 +0000 (13:03 -0500)
committerStephan Wiesand <stephan.wiesand@desy.de>
Mon, 25 Mar 2013 14:56:55 +0000 (07:56 -0700)
Almost a year ago, mckusick changed the VFS KPI/KBI for the cmount
VFS operation, making the flags argument a 64-bit quantity.
Introduce appropriate conditionals for our prototype of afs_cmount
for the change on the 10.x and 9.x branches.

Reviewed-on: http://gerrit.openafs.org/8907
Reviewed-by: Garrett Wollman <wollman@csail.mit.edu>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
(cherry picked from commit 13111d25408cf6765d1b67bc3767614c8963cfde)

Change-Id: I6e74760422f57336203d562dc4ee39ed2af0df84
Reviewed-on: http://gerrit.openafs.org/9406
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Reviewed-by: Andrew Deason <adeason@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
src/afs/FBSD/osi_vfsops.c

index 3311e94ae1752dcd8eec88b283aabf6d25f23b96..c4d35ba2357b276ac580e3eaae26c3aeecfe810b 100644 (file)
@@ -185,7 +185,9 @@ afs_mount(struct mount *mp, struct thread *td)
 
 #ifdef AFS_FBSD60_ENV
 static int
-#ifdef AFS_FBSD80_ENV
+#if (__FreeBSD_version >= 900503 && __FreeBSD_version < 1000000) || __FreeBSD_version >= 1000004
+afs_cmount(struct mntarg *ma, void *data, uint64_t flags)
+#elif defined(AFS_FBSD80_ENV)
 afs_cmount(struct mntarg *ma, void *data, int flags)
 #else
 afs_cmount(struct mntarg *ma, void *data, int flags, struct thread *td)