svn commit: r361070 - in stable: 11/sys/fs/nfs 11/sys/fs/nfsclient 11/sys/fs/nfsserver 12/sys/fs/nfs 12/sys/fs/nfsclient 12/sys/fs/nfsserver
Ryan Moeller
freqlabs at FreeBSD.org
Fri May 15 01:01:07 UTC 2020
Author: freqlabs
Date: Fri May 15 01:01:02 2020
New Revision: 361070
URL: https://svnweb.freebsd.org/changeset/base/361070
Log:
MFC r360813:
Remove APPLEKEXT ifndefs
They are no longer useful.
Reviewed by: rmacklem
Approved by: mav (mentor)
Sponsored by: iXsystems, Inc.
Differential Revision: https://reviews.freebsd.org/D24752
Modified:
stable/12/sys/fs/nfs/nfs_commonacl.c
stable/12/sys/fs/nfs/nfs_commonsubs.c
stable/12/sys/fs/nfsclient/nfs_clcomsubs.c
stable/12/sys/fs/nfsclient/nfs_clrpcops.c
stable/12/sys/fs/nfsclient/nfs_clstate.c
stable/12/sys/fs/nfsserver/nfs_nfsdcache.c
stable/12/sys/fs/nfsserver/nfs_nfsdserv.c
stable/12/sys/fs/nfsserver/nfs_nfsdsocket.c
stable/12/sys/fs/nfsserver/nfs_nfsdstate.c
stable/12/sys/fs/nfsserver/nfs_nfsdsubs.c
Directory Properties:
stable/12/ (props changed)
Changes in other areas also in this revision:
Modified:
stable/11/sys/fs/nfs/nfs_commonacl.c
stable/11/sys/fs/nfs/nfs_commonsubs.c
stable/11/sys/fs/nfsclient/nfs_clcomsubs.c
stable/11/sys/fs/nfsclient/nfs_clrpcops.c
stable/11/sys/fs/nfsclient/nfs_clstate.c
stable/11/sys/fs/nfsserver/nfs_nfsdcache.c
stable/11/sys/fs/nfsserver/nfs_nfsdserv.c
stable/11/sys/fs/nfsserver/nfs_nfsdsocket.c
stable/11/sys/fs/nfsserver/nfs_nfsdstate.c
stable/11/sys/fs/nfsserver/nfs_nfsdsubs.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/12/sys/fs/nfs/nfs_commonacl.c
==============================================================================
--- stable/12/sys/fs/nfs/nfs_commonacl.c Fri May 15 00:51:30 2020 (r361069)
+++ stable/12/sys/fs/nfs/nfs_commonacl.c Fri May 15 01:01:02 2020 (r361070)
@@ -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);
Modified: stable/12/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- stable/12/sys/fs/nfs/nfs_commonsubs.c Fri May 15 00:51:30 2020 (r361069)
+++ stable/12/sys/fs/nfs/nfs_commonsubs.c Fri May 15 01:01:02 2020 (r361070)
@@ -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"
@@ -169,7 +168,6 @@ struct nfsv4_opflag nfsv4_opflag[NFSV41_NOPS] = {
{ 0, 0, 0, 0, LK_EXCLUSIVE, 0, 0 }, /* Destroy ClientID */
{ 0, 0, 0, 0, LK_EXCLUSIVE, 1, 0 }, /* Reclaim Complete */
};
-#endif /* !APPLEKEXT */
static int ncl_mbuf_mhlen = MHLEN;
static int nfsrv_usercnt = 0;
Modified: stable/12/sys/fs/nfsclient/nfs_clcomsubs.c
==============================================================================
--- stable/12/sys/fs/nfsclient/nfs_clcomsubs.c Fri May 15 00:51:30 2020 (r361069)
+++ stable/12/sys/fs/nfsclient/nfs_clcomsubs.c Fri May 15 01:01:02 2020 (r361070)
@@ -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 }};
Modified: stable/12/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- stable/12/sys/fs/nfsclient/nfs_clrpcops.c Fri May 15 00:51:30 2020 (r361069)
+++ stable/12/sys/fs/nfsclient/nfs_clrpcops.c Fri May 15 01:01:02 2020 (r361070)
@@ -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>
@@ -78,7 +77,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)
Modified: stable/12/sys/fs/nfsclient/nfs_clstate.c
==============================================================================
--- stable/12/sys/fs/nfsclient/nfs_clstate.c Fri May 15 00:51:30 2020 (r361069)
+++ stable/12/sys/fs/nfsclient/nfs_clstate.c Fri May 15 01:01:02 2020 (r361070)
@@ -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;
Modified: stable/12/sys/fs/nfsserver/nfs_nfsdcache.c
==============================================================================
--- stable/12/sys/fs/nfsserver/nfs_nfsdcache.c Fri May 15 00:51:30 2020 (r361069)
+++ stable/12/sys/fs/nfsserver/nfs_nfsdcache.c Fri May 15 01:01:02 2020 (r361070)
@@ -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);
Modified: stable/12/sys/fs/nfsserver/nfs_nfsdserv.c
==============================================================================
--- stable/12/sys/fs/nfsserver/nfs_nfsdserv.c Fri May 15 00:51:30 2020 (r361069)
+++ stable/12/sys/fs/nfsserver/nfs_nfsdserv.c Fri May 15 01:01:02 2020 (r361070)
@@ -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>
/* Global vars */
@@ -65,7 +64,6 @@ extern int nfsd_debuglevel;
extern u_long sb_max_adj;
extern int nfsrv_pnfsatime;
extern int nfsrv_maxpnfsmirror;
-#endif /* !APPLEKEXT */
static int nfs_async = 0;
SYSCTL_DECL(_vfs_nfsd);
Modified: stable/12/sys/fs/nfsserver/nfs_nfsdsocket.c
==============================================================================
--- stable/12/sys/fs/nfsserver/nfs_nfsdsocket.c Fri May 15 00:51:30 2020 (r361069)
+++ stable/12/sys/fs/nfsserver/nfs_nfsdsocket.c Fri May 15 01:01:02 2020 (r361070)
@@ -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;
@@ -327,7 +326,6 @@ int (*nfsrv4_ops2[NFSV41_NOPS])(struct nfsrv_descript
(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
(int (*)(struct nfsrv_descript *, int, vnode_t , vnode_t , NFSPROC_T *, struct nfsexstuff *, struct nfsexstuff *))0,
};
-#endif /* !APPLEKEXT */
/*
* Static array that defines which nfs rpc's are nonidempotent
Modified: stable/12/sys/fs/nfsserver/nfs_nfsdstate.c
==============================================================================
--- stable/12/sys/fs/nfsserver/nfs_nfsdstate.c Fri May 15 00:51:30 2020 (r361069)
+++ stable/12/sys/fs/nfsserver/nfs_nfsdstate.c Fri May 15 01:01:02 2020 (r361070)
@@ -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;
Modified: stable/12/sys/fs/nfsserver/nfs_nfsdsubs.c
==============================================================================
--- stable/12/sys/fs/nfsserver/nfs_nfsdsubs.c Fri May 15 00:51:30 2020 (r361069)
+++ stable/12/sys/fs/nfsserver/nfs_nfsdsubs.c Fri May 15 01:01:02 2020 (r361070)
@@ -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);
More information about the svn-src-all
mailing list