Date: Thu, 7 Jun 2018 10:58:48 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r334772 - projects/pnfs-planb-server/sys/fs/nfs Message-ID: <201806071058.w57Awmul055290@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Thu Jun 7 10:58:48 2018 New Revision: 334772 URL: https://svnweb.freebsd.org/changeset/base/334772 Log: Change nfsproto.h slightly, so that it exposes NFSPROC_xxx to userland, but only if they are not already defined. Modified: projects/pnfs-planb-server/sys/fs/nfs/nfsproto.h Modified: projects/pnfs-planb-server/sys/fs/nfs/nfsproto.h ============================================================================== --- projects/pnfs-planb-server/sys/fs/nfs/nfsproto.h Thu Jun 7 09:03:42 2018 (r334771) +++ projects/pnfs-planb-server/sys/fs/nfs/nfsproto.h Thu Jun 7 10:58:48 2018 (r334772) @@ -278,7 +278,7 @@ /* variants for multiple versions */ #define NFSX_STATFS(v3) ((v3) ? NFSX_V3STATFS : NFSX_V2STATFS) -#if defined(_KERNEL) || defined(KERNEL) +#ifndef NFSPROC_NULL /* nfs rpc procedure numbers (before version mapping) */ #define NFSPROC_NULL 0 #define NFSPROC_GETATTR 1 @@ -302,6 +302,7 @@ #define NFSPROC_FSINFO 19 #define NFSPROC_PATHCONF 20 #define NFSPROC_COMMIT 21 +#endif /* NFSPROC_NULL */ /* * The lower numbers -> 21 are used by NFSv2 and v3. These define higher @@ -360,7 +361,6 @@ #define NFSV41_NPROCS 56 #endif /* NFS_V3NPROCS */ -#endif /* _KERNEL */ /* * Define NFS_NPROCS as NFSV4_NPROCS for the experimental kernel code.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806071058.w57Awmul055290>