svn commit: r320070 - in head/sys: fs/nfs fs/nfsclient sys

[Rick Macklem]

Author: rmacklem
Date: Sun Jun 18 12:28:43 2017
New Revision: 320070
URL: https://svnweb.freebsd.org/changeset/base/320070

Log:
  Take "extern int maxbcachebuf" out of sys/param.h, since it breaks the
  arm build.
  
  In the arm build, elf_note.S includes sys/param.h and then does an
  elf macro called ELFNOTE(). Although the compile error doesn't make
  sense to me, I believe it just means that an "extern ..." can't exist
  in param.h for this inclusion case.
  I suspect adding #if !defined(LOCORE) might fix the build, but this
  commit just takes the definition out.
  I will ask freebsd-current@ what is the best was to deal with this
  and do a subsequent commit after that.
  
  Reported by:	melounmichal at gmail.com

Modified:
  head/sys/fs/nfs/nfs_commonkrpc.c
  head/sys/fs/nfsclient/nfs_clvfsops.c
  head/sys/sys/param.h

Modified: head/sys/fs/nfs/nfs_commonkrpc.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonkrpc.c	Sun Jun 18 11:51:03 2017	(r320069)
+++ head/sys/fs/nfs/nfs_commonkrpc.c	Sun Jun 18 12:28:43 2017	(r320070)
@@ -96,6 +96,7 @@ extern int nfscl_ticks;
 extern void (*ncl_call_invalcaches)(struct vnode *);
 extern int nfs_numnfscbd;
 extern int nfscl_debuglevel;
+extern int maxbcachebuf;
 
 SVCPOOL		*nfscbd_pool;
 static int	nfsrv_gsscallbackson = 0;

Modified: head/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvfsops.c	Sun Jun 18 11:51:03 2017	(r320069)
+++ head/sys/fs/nfsclient/nfs_clvfsops.c	Sun Jun 18 12:28:43 2017	(r320070)
@@ -83,6 +83,7 @@ extern int nfscl_debuglevel;
 extern enum nfsiod_state ncl_iodwant[NFS_MAXASYNCDAEMON];
 extern struct nfsmount *ncl_iodmount[NFS_MAXASYNCDAEMON];
 extern struct mtx ncl_iod_mutex;
+extern int maxbcachebuf;
 NFSCLSTATEMUTEX;
 
 MALLOC_DEFINE(M_NEWNFSREQ, "newnfsclient_req", "NFS request header");

Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h	Sun Jun 18 11:51:03 2017	(r320069)
+++ head/sys/sys/param.h	Sun Jun 18 12:28:43 2017	(r320070)
@@ -265,14 +265,6 @@
 #define BKVAMASK	(BKVASIZE-1)
 
 /*
- * This variable is tuned via vfs.maxbcachebuf and is set to the value of
- * MAXBCACHEBUF by default.
- */
-#ifdef _KERNEL
-extern int	maxbcachebuf;
-#endif
-
-/*
  * MAXPATHLEN defines the longest permissible path length after expanding
  * symbolic links. It is used to allocate a temporary buffer from the buffer
  * pool in which to do the name expansion, hence should be a power of two,