Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Apr 2011 07:36:53 +0000 (UTC)
From:      Ruslan Ermilov <ru@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject:   svn commit: r220815 - stable/8/sys/nfsclient
Message-ID:  <201104190736.p3J7arv5098475@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: ru
Date: Tue Apr 19 07:36:53 2011
New Revision: 220815
URL: http://svn.freebsd.org/changeset/base/220815

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

Modified:
  stable/8/sys/nfsclient/nfs_subs.c
Directory Properties:
  stable/8/sys/   (props changed)

Modified: stable/8/sys/nfsclient/nfs_subs.c
==============================================================================
--- stable/8/sys/nfsclient/nfs_subs.c	Tue Apr 19 07:30:22 2011	(r220814)
+++ stable/8/sys/nfsclient/nfs_subs.c	Tue Apr 19 07:36:53 2011	(r220815)
@@ -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);
 	}



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