svn commit: r220595 - head/sys/nfsclient

Ruslan Ermilov ru at FreeBSD.org
Wed Apr 13 12:46:25 UTC 2011


Author: ru
Date: Wed Apr 13 12:46:25 2011
New Revision: 220595
URL: http://svn.freebsd.org/changeset/base/220595

Log:
  - Fixed nfs_printf() to use vprintf().
  - Fixed vfs.nfs.acdebug sysctl's description.
  - Fixed panic when compiled with NFS_ACDEBUG.
  
  MFC after:	3 days

Modified:
  head/sys/nfsclient/nfs_subs.c

Modified: head/sys/nfsclient/nfs_subs.c
==============================================================================
--- head/sys/nfsclient/nfs_subs.c	Wed Apr 13 12:19:03 2011	(r220594)
+++ head/sys/nfsclient/nfs_subs.c	Wed Apr 13 12:46:25 2011	(r220595)
@@ -442,7 +442,7 @@ nfs_printf(const char *fmt, ...)
 
 	mtx_lock(&Giant);
 	va_start(ap, fmt);
-	printf(fmt, ap);
+	vprintf(fmt, ap);
 	va_end(ap);
 	mtx_unlock(&Giant);
 }
@@ -656,7 +656,7 @@ out:
 SYSCTL_DECL(_vfs_nfs);
 static int nfs_acdebug;
 SYSCTL_INT(_vfs_nfs, OID_AUTO, acdebug, CTLFLAG_RW, &nfs_acdebug, 0,
-    "Toggle acdebug (access cache debug) flag");
+    "Toggle acdebug (attribute cache debug) flag");
 #endif
 
 /*
@@ -713,6 +713,9 @@ nfs_getattrcache(struct vnode *vp, struc
 	if ((time_second - np->n_attrstamp) >= timeo) {
 		nfsstats.attrcache_misses++;
 		mtx_unlock(&np->n_mtx);
+#ifdef NFS_ACDEBUG
+		mtx_unlock(&Giant);	/* nfs_printf() */
+#endif
 		KDTRACE_NFS_ATTRCACHE_GET_MISS(vp);
 		return (ENOENT);
 	}


More information about the svn-src-head mailing list