From 13111d25408cf6765d1b67bc3767614c8963cfde Mon Sep 17 00:00:00 2001 From: Ben Kaduk Date: Fri, 11 Jan 2013 13:03:02 -0500 Subject: [PATCH] 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. Change-Id: Ia0b8759f027e64f98f087daabbf1a51030171f21 Reviewed-on: http://gerrit.openafs.org/8907 Reviewed-by: Garrett Wollman Tested-by: BuildBot Reviewed-by: Derrick Brashear --- src/afs/FBSD/osi_vfsops.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/afs/FBSD/osi_vfsops.c b/src/afs/FBSD/osi_vfsops.c index a1b546367..0878e65d7 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) -- 2.39.5