Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 19 Jun 2017 22:07:53 +0000 (UTC)
From:      Rick Macklem <rmacklem@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r320126 - in head/sys: fs/nfs fs/nfsclient sys
Message-ID:  <201706192207.v5JM7rVn067400@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: rmacklem
Date: Mon Jun 19 22:07:53 2017
New Revision: 320126
URL: https://svnweb.freebsd.org/changeset/base/320126

Log:
  Add the definition of maxbcachebuf to sys/buf.h.
  
  r320070 removed the definition of maxbcachebuf from sys/param.h to
  fix the build for arm.
  This patch adds the definition of maxbcachebuf to sys/buf.h, which
  should be ok, since sys/buf.h is not being included in arm/arm/elf_note.S.
  
  Suggested by:	kib
  MFC after:	2 weeks

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

Modified: head/sys/fs/nfs/nfs_commonkrpc.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonkrpc.c	Mon Jun 19 21:48:52 2017	(r320125)
+++ head/sys/fs/nfs/nfs_commonkrpc.c	Mon Jun 19 22:07:53 2017	(r320126)
@@ -96,7 +96,6 @@ 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	Mon Jun 19 21:48:52 2017	(r320125)
+++ head/sys/fs/nfsclient/nfs_clvfsops.c	Mon Jun 19 22:07:53 2017	(r320126)
@@ -83,7 +83,6 @@ 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/buf.h
==============================================================================
--- head/sys/sys/buf.h	Mon Jun 19 21:48:52 2017	(r320125)
+++ head/sys/sys/buf.h	Mon Jun 19 22:07:53 2017	(r320126)
@@ -472,6 +472,7 @@ buf_track(struct buf *bp, const char *location)
 extern int	nbuf;			/* The number of buffer headers */
 extern long	maxswzone;		/* Max KVA for swap structures */
 extern long	maxbcache;		/* Max KVA for buffer cache */
+extern int	maxbcachebuf;		/* Max buffer cache block size */
 extern long	runningbufspace;
 extern long	hibufspace;
 extern int	dirtybufthresh;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201706192207.v5JM7rVn067400>