From: Ben Kaduk <kaduk@mit.edu>
Date: Fri, 11 Jan 2013 18:03:02 +0000 (-0500)
Subject: Catch up to FreeBSD KPI for vfs_cmount
X-Git-Tag: upstream/1.6.3^2~79
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=5f983ae0b97fee5bd56bb939a5dc5a4fc78b44bc;p=packages%2Fo%2Fopenafs.git

Catch up to FreeBSD KPI for vfs_cmount

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>
---

diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c
index 3311e94ae..c4d35ba23 100644
--- a/src/afs/FBSD/osi_vfsops.c
+++ b/src/afs/FBSD/osi_vfsops.c
@@ -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)