Page MenuHomeFreeBSD
Files F109742905

D24752.diff
No OneTemporary
Actions

D24752.diff
View Options

Index: sys/fs/nfs/nfs_commonacl.c
===================================================================
--- sys/fs/nfs/nfs_commonacl.c
+++ sys/fs/nfs/nfs_commonacl.c
@@ -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);
Index: sys/fs/nfs/nfs_commonsubs.c
===================================================================
--- sys/fs/nfs/nfs_commonsubs.c
+++ sys/fs/nfs/nfs_commonsubs.c
@@ -41,7 +41,6 @@
* 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 @@
{ 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;
Index: sys/fs/nfsclient/nfs_clcomsubs.c
===================================================================
--- sys/fs/nfsclient/nfs_clcomsubs.c
+++ sys/fs/nfsclient/nfs_clcomsubs.c
@@ -41,7 +41,6 @@
* 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 enum vtype newnv2tov_type[8];
extern enum vtype nv34tov_type[8];
NFSCLSTATEMUTEX;
-#endif /* !APPLEKEXT */
static nfsuint64 nfs_nullcookie = {{ 0, 0 }};
Index: sys/fs/nfsclient/nfs_clrpcops.c
===================================================================
--- sys/fs/nfsclient/nfs_clrpcops.c
+++ sys/fs/nfsclient/nfs_clrpcops.c
@@ -44,7 +44,6 @@
* 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_enablecallb = 0;
short nfsv4_cbport = NFSV4_CBPORT;
int nfstest_openallsetattr = 0;
-#endif /* !APPLEKEXT */
#define DIRHDSIZ offsetof(struct dirent, d_name)
Index: sys/fs/nfsclient/nfs_clstate.c
===================================================================
--- sys/fs/nfsclient/nfs_clstate.c
+++ sys/fs/nfsclient/nfs_clstate.c
@@ -80,7 +80,6 @@
* (Since we are done with them, they do not need to be recovered.)
*/
-#ifndef APPLEKEXT
#include <fs/nfs/nfsport.h>
/*
@@ -98,7 +97,6 @@
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;
Index: sys/fs/nfsserver/nfs_nfsdcache.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdcache.c
+++ sys/fs/nfsserver/nfs_nfsdcache.c
@@ -158,7 +158,6 @@
* 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 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);
Index: sys/fs/nfsserver/nfs_nfsdserv.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdserv.c
+++ sys/fs/nfsserver/nfs_nfsdserv.c
@@ -48,7 +48,6 @@
* 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 int nfsrv_pnfsatime;
extern int nfsrv_maxpnfsmirror;
extern int nfs_maxcopyrange;
-#endif /* !APPLEKEXT */
static int nfs_async = 0;
SYSCTL_DECL(_vfs_nfsd);
Index: sys/fs/nfsserver/nfs_nfsdsocket.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdsocket.c
+++ sys/fs/nfsserver/nfs_nfsdsocket.c
@@ -40,7 +40,6 @@
* Socket operations for use by the nfs server.
*/
-#ifndef APPLEKEXT
#include <fs/nfs/nfsport.h>
extern struct nfsstatsv1 nfsstatsv1;
@@ -374,7 +373,6 @@
(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
Index: sys/fs/nfsserver/nfs_nfsdstate.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdstate.c
+++ sys/fs/nfsserver/nfs_nfsdstate.c
@@ -32,7 +32,6 @@
#include "opt_inet.h"
#include "opt_inet6.h"
-#ifndef APPLEKEXT
#include <sys/extattr.h>
#include <fs/nfs/nfsport.h>
@@ -123,7 +122,6 @@
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;
Index: sys/fs/nfsserver/nfs_nfsdsubs.c
===================================================================
--- sys/fs/nfsserver/nfs_nfsdsubs.c
+++ sys/fs/nfsserver/nfs_nfsdsubs.c
@@ -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 @@
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);

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 9, 11:47 PM (20 h, 27 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16566053
Default Alt Text
D24752.diff (5 KB)

Event Timeline