Author: rmacklem
Date: Tue Dec 23 14:24:36 2014
New Revision: 276140
URL: https://svnweb.freebsd.org/changeset/base/276140
Log:
Fix kernel builds with "options NFS_DEBUG" that
were broken by r276096. Also delete the two
kernel options NFS_GATHERDELAY, NFS_WDELAYHASHSIZ
which are no longer used.
Reported by: bz
Modified:
head/sys/conf/NOTES
head/sys/conf/options
head/sys/fs/nfs/nfsport.h
head/sys/fs/nfsclient/nfs.h
head/sys/fs/nfsclient/nfs_clvfsops.c
Modified: head/sys/conf/NOTES
==============================================================================
--- head/sys/conf/NOTES Tue Dec 23 12:45:29 2014 (r276139)
+++ head/sys/conf/NOTES Tue Dec 23 14:24:36 2014 (r276140)
@@ -1098,8 +1098,6 @@ options NFS_MINATTRTIMO=3 # VREG attrib
options NFS_MAXATTRTIMO=60
options NFS_MINDIRATTRTIMO=30 # VDIR attrib cache timeout in sec
options NFS_MAXDIRATTRTIMO=60
-options NFS_GATHERDELAY=10 # Default write gather delay (msec)
-options NFS_WDELAYHASHSIZ=16 # and with this
options NFS_DEBUG # Enable NFS Debugging
#
Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options Tue Dec 23 12:45:29 2014 (r276139)
+++ head/sys/conf/options Tue Dec 23 14:24:36 2014 (r276140)
@@ -619,8 +619,6 @@ NFS_MINATTRTIMO opt_nfs.h
NFS_MAXATTRTIMO opt_nfs.h
NFS_MINDIRATTRTIMO opt_nfs.h
NFS_MAXDIRATTRTIMO opt_nfs.h
-NFS_GATHERDELAY opt_nfs.h
-NFS_WDELAYHASHSIZ opt_nfs.h
NFS_DEBUG opt_nfs.h
# For the Bt848/Bt848A/Bt849/Bt878/Bt879 driver
Modified: head/sys/fs/nfs/nfsport.h
==============================================================================
--- head/sys/fs/nfs/nfsport.h Tue Dec 23 12:45:29 2014 (r276139)
+++ head/sys/fs/nfs/nfsport.h Tue Dec 23 14:24:36 2014 (r276140)
@@ -930,24 +930,6 @@ void nfsd_mntinit(void);
int newnfs_iosize(struct nfsmount *);
-#ifdef NFS_DEBUG
-
-extern int nfs_debug;
-#define NFS_DEBUG_ASYNCIO 1 /* asynchronous i/o */
-#define NFS_DEBUG_WG 2 /* server write gathering */
-#define NFS_DEBUG_RC 4 /* server request caching */
-
-#define NFS_DPF(cat, args) \
- do { \
- if (nfs_debug & NFS_DEBUG_##cat) printf args; \
- } while (0)
-
-#else
-
-#define NFS_DPF(cat, args)
-
-#endif
-
int newnfs_vncmpf(struct vnode *, void *);
#ifndef NFS_MINDIRATTRTIMO
Modified: head/sys/fs/nfsclient/nfs.h
==============================================================================
--- head/sys/fs/nfsclient/nfs.h Tue Dec 23 12:45:29 2014 (r276139)
+++ head/sys/fs/nfsclient/nfs.h Tue Dec 23 14:24:36 2014 (r276140)
@@ -55,6 +55,24 @@
#define NFS_ISV34(v) \
(VFSTONFS((v)->v_mount)->nm_flag & (NFSMNT_NFSV3 | NFSMNT_NFSV4))
+#ifdef NFS_DEBUG
+
+extern int nfs_debug;
+#define NFS_DEBUG_ASYNCIO 1 /* asynchronous i/o */
+#define NFS_DEBUG_WG 2 /* server write gathering */
+#define NFS_DEBUG_RC 4 /* server request caching */
+
+#define NFS_DPF(cat, args) \
+ do { \
+ if (nfs_debug & NFS_DEBUG_##cat) printf args; \
+ } while (0)
+
+#else
+
+#define NFS_DPF(cat, args)
+
+#endif
+
/*
* NFS iod threads can be in one of these three states once spawned.
* NFSIOD_NOT_AVAILABLE - Cannot be assigned an I/O operation at this time.
Modified: head/sys/fs/nfsclient/nfs_clvfsops.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clvfsops.c Tue Dec 23 12:45:29 2014
(r276139)
+++ head/sys/fs/nfsclient/nfs_clvfsops.c Tue Dec 23 14:24:36 2014
(r276140)
@@ -100,6 +100,11 @@ SYSCTL_INT(_vfs_nfs, NFS_TPRINTF_INITIAL
static int nfs_tprintf_delay = NFS_TPRINTF_DELAY;
SYSCTL_INT(_vfs_nfs, NFS_TPRINTF_DELAY,
downdelayinterval, CTLFLAG_RW, &nfs_tprintf_delay, 0, "");
+#ifdef NFS_DEBUG
+int nfs_debug;
+SYSCTL_INT(_vfs_nfs, OID_AUTO, debug, CTLFLAG_RW, &nfs_debug, 0,
+ "Toggle debug flag");
+#endif
static int nfs_mountroot(struct mount *);
static void nfs_sec_name(char *, int *);
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
