d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove APPLEKEXT ifndefs

Browse Source 
They are no longer useful.

Reviewed by:	rmacklem
Approved by:	mav (mentor)
MFC after:	1 week
Sponsored by:	iXsystems, Inc.
Differential Revision:	https://reviews.freebsd.org/D24752
This commit is contained in:
freqlabs 2020-05-08 14:39:38 +00:00
parent 5d95e8366d
commit fffdb38f0a
10 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/fs/nfs/nfs_commonacl.c
View File

@ -30,11 +30,9 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#ifndef APPLEKEXT
#include <fs/nfs/nfsport.h>
extern int nfsrv_useacl;
#endif
static int nfsrv_acemasktoperm(u_int32_t acetype, u_int32_t mask, int owner,
enum vtype type, acl_perm_t *permp);

2
sys/fs/nfs/nfs_commonsubs.c
View File

@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
* the nfs op functions. They do things like create the rpc header and
* copy data between mbuf chains and uio lists.
*/
#ifndef APPLEKEXT
#include "opt_inet.h"
#include "opt_inet6.h"
@ -192,7 +191,6 @@ struct nfsv4_opflag nfsv4_opflag[NFSV42_NOPS] = {
{ 0, 1, 0, 0, LK_SHARED, 1, 1 }, /* Listxattrs */
{ 0, 1, 1, 1, LK_EXCLUSIVE, 1, 1 }, /* Removexattr */
};
#endif /* !APPLEKEXT */
static int ncl_mbuf_mhlen = MHLEN;
static int nfsrv_usercnt = 0;

2
sys/fs/nfsclient/nfs_clcomsubs.c
View File

@ -41,7 +41,6 @@ __FBSDID("$FreeBSD$");
* the nfs op functions. They do things like create the rpc header and
* copy data between mbuf chains and uio lists.
*/
#ifndef APPLEKEXT
#include <fs/nfs/nfsport.h>
extern struct nfsstatsv1 nfsstatsv1;
@ -49,7 +48,6 @@ extern int ncl_mbuf_mlen;
extern enum vtype newnv2tov_type[8];
extern enum vtype nv34tov_type[8];
NFSCLSTATEMUTEX;
#endif /* !APPLEKEXT */
static nfsuint64 nfs_nullcookie = {{ 0, 0 }};

2
sys/fs/nfsclient/nfs_clrpcops.c
View File

@ -44,7 +44,6 @@ __FBSDID("$FreeBSD$");
* arguments are all at the end, after the NFSPROC_T *p one.
*/
#ifndef APPLEKEXT
#include "opt_inet6.h"
#include <fs/nfs/nfsport.h>
@ -82,7 +81,6 @@ int nfscl_assumeposixlocks = 1;
int nfscl_enablecallb = 0;
short nfsv4_cbport = NFSV4_CBPORT;
int nfstest_openallsetattr = 0;
#endif /* !APPLEKEXT */
#define DIRHDSIZ offsetof(struct dirent, d_name)

2
sys/fs/nfsclient/nfs_clstate.c
View File

@ -80,7 +80,6 @@ __FBSDID("$FreeBSD$");
* (Since we are done with them, they do not need to be recovered.)
*/
#ifndef APPLEKEXT
#include <fs/nfs/nfsport.h>
/*
@ -98,7 +97,6 @@ int nfscl_inited = 0;
struct nfsclhead nfsclhead; /* Head of clientid list */
int nfscl_deleghighwater = NFSCLDELEGHIGHWATER;
int nfscl_layouthighwater = NFSCLLAYOUTHIGHWATER;
#endif /* !APPLEKEXT */
static int nfscl_delegcnt = 0;
static int nfscl_layoutcnt = 0;

2
sys/fs/nfsserver/nfs_nfsdcache.c
View File

@ -158,7 +158,6 @@ __FBSDID("$FreeBSD$");
* that case. This level should be set high enough that this almost
* never happens.
*/
#ifndef APPLEKEXT
#include <fs/nfs/nfsport.h>
extern struct nfsstatsv1 nfsstatsv1;
@ -166,7 +165,6 @@ extern struct mtx nfsrc_udpmtx;
extern struct nfsrchash_bucket nfsrchash_table[NFSRVCACHE_HASHSIZE];
extern struct nfsrchash_bucket nfsrcahash_table[NFSRVCACHE_HASHSIZE];
int nfsrc_floodlevel = NFSRVCACHE_FLOODLEVEL, nfsrc_tcpsavedreplies = 0;
#endif /* !APPLEKEXT */
SYSCTL_DECL(_vfs_nfsd);

2
sys/fs/nfsserver/nfs_nfsdserv.c
View File

@ -48,7 +48,6 @@ __FBSDID("$FreeBSD$");
* For nfsv4, these functions are called for each Op within the Compound RPC.
*/
#ifndef APPLEKEXT
#include <fs/nfs/nfsport.h>
#include <sys/extattr.h>
#include <sys/filio.h>
@ -68,7 +67,6 @@ extern u_long sb_max_adj;
extern int nfsrv_pnfsatime;
extern int nfsrv_maxpnfsmirror;
extern int nfs_maxcopyrange;
#endif /* !APPLEKEXT */
static int nfs_async = 0;
SYSCTL_DECL(_vfs_nfsd);

2
sys/fs/nfsserver/nfs_nfsdsocket.c
View File

@ -40,7 +40,6 @@ __FBSDID("$FreeBSD$");
* Socket operations for use by the nfs server.
*/
#ifndef APPLEKEXT
#include <fs/nfs/nfsport.h>
extern struct nfsstatsv1 nfsstatsv1;
@ -374,7 +373,6 @@ int (*nfsrv4_ops2[NFSV42_NOPS])(struct nfsrv_descript *,
(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , struct nfsexstuff *, struct nfsexstuff *))0,
(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , struct nfsexstuff *, struct nfsexstuff *))0,
};
#endif /* !APPLEKEXT */
/*
* Static array that defines which nfs rpc's are nonidempotent

2
sys/fs/nfsserver/nfs_nfsdstate.c
View File

@ -32,7 +32,6 @@ __FBSDID("$FreeBSD$");
#include "opt_inet.h"
#include "opt_inet6.h"
#ifndef APPLEKEXT
#include <sys/extattr.h>
#include <fs/nfs/nfsport.h>
@ -123,7 +122,6 @@ struct nfslockhashhead *nfslockhash;
struct nfssessionhash *nfssessionhash;
struct nfslayouthash *nfslayouthash;
volatile int nfsrv_dontlistlen = 0;
#endif /* !APPLEKEXT */
static u_int32_t nfsrv_openpluslock = 0, nfsrv_delegatecnt = 0;
static time_t nfsrvboottime;

2
sys/fs/nfsserver/nfs_nfsdsubs.c
View File

@ -36,7 +36,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
#ifndef APPLEKEXT
/*
* These functions support the macros and help fiddle mbuf chains for
* the nfs op functions. They do things like create the rpc header and
@ -62,7 +61,6 @@ struct nfslayouthead nfsrv_recalllisthead;
static nfstype newnfsv2_type[9] = { NFNON, NFREG, NFDIR, NFBLK, NFCHR, NFLNK,
NFNON, NFCHR, NFNON };
extern nfstype nfsv34_type[9];
#endif /* !APPLEKEXT */
static u_int32_t nfsrv_isannfserr(u_int32_t);