[Midnightbsd-cvs] src [8122] trunk/sys/fs: deal with printf better

[laffer1 at midnightbsd.org]

Revision: 8122
          http://svnweb.midnightbsd.org/src/?rev=8122
Author:   laffer1
Date:     2016-09-16 17:41:00 -0400 (Fri, 16 Sep 2016)
Log Message:
-----------
deal with printf better

Modified Paths:
--------------
    trunk/sys/fs/nfs/nfs_commonport.c
    trunk/sys/fs/nfs/nfscl.h
    trunk/sys/fs/nfsclient/nfs_clrpcops.c

Modified: trunk/sys/fs/nfs/nfs_commonport.c
===================================================================
--- trunk/sys/fs/nfs/nfs_commonport.c	2016-09-16 21:40:26 UTC (rev 8121)
+++ trunk/sys/fs/nfs/nfs_commonport.c	2016-09-16 21:41:00 UTC (rev 8122)
@@ -60,6 +60,7 @@
 int newnfs_numnfsd = 0;
 struct nfsstats newnfsstats;
 int nfs_numnfscbd = 0;
+int nfscl_debuglevel = 0;
 char nfsv4_callbackaddr[INET6_ADDRSTRLEN];
 struct callout newnfsd_callout;
 void (*nfsd_call_servertimer)(void) = NULL;
@@ -76,6 +77,8 @@
 SYSCTL_STRING(_vfs_nfs, OID_AUTO, callback_addr, CTLFLAG_RW,
     nfsv4_callbackaddr, sizeof(nfsv4_callbackaddr),
     "NFSv4 callback addr for server to use");
+SYSCTL_INT(_vfs_nfs, OID_AUTO, debuglevel, CTLFLAG_RW, &nfscl_debuglevel,
+    0, "Debug level for new nfs client");
 
 /*
  * Defines for malloc

Modified: trunk/sys/fs/nfs/nfscl.h
===================================================================
--- trunk/sys/fs/nfs/nfscl.h	2016-09-16 21:40:26 UTC (rev 8121)
+++ trunk/sys/fs/nfs/nfscl.h	2016-09-16 21:41:00 UTC (rev 8122)
@@ -68,4 +68,10 @@
 #define	NFSSATTR_SIZENEG1	0x4
 #define	NFSSATTR_SIZERDEV	0x8
 
+/* Use this macro for debug printfs. */
+#define	NFSCL_DEBUG(level, ...)	do {					\
+		if (nfscl_debuglevel >= (level))			\
+			printf(__VA_ARGS__);				\
+	} while (0)
+
 #endif	/* _NFS_NFSCL_H */

Modified: trunk/sys/fs/nfsclient/nfs_clrpcops.c
===================================================================
--- trunk/sys/fs/nfsclient/nfs_clrpcops.c	2016-09-16 21:40:26 UTC (rev 8121)
+++ trunk/sys/fs/nfsclient/nfs_clrpcops.c	2016-09-16 21:41:00 UTC (rev 8122)
@@ -56,6 +56,7 @@
 extern nfstype nfsv34_type[9];
 extern int nfsrv_useacl;
 extern char nfsv4_callbackaddr[INET6_ADDRSTRLEN];
+extern int nfscl_debuglevel;
 NFSCLSTATEMUTEX;
 int nfstest_outofseq = 0;
 int nfscl_assumeposixlocks = 1;
@@ -1398,7 +1399,7 @@
 			if (stateid.other[0] == 0 && stateid.other[1] == 0 &&
 			    stateid.other[2] == 0) {
 				nostateid = 1;
-				printf("stateid0 in write\n");
+				NFSCL_DEBUG(1, "stateid0 in write\n");
 			}
 		}