Module Name: src
Committed By: riz
Date: Tue Mar 29 19:47:37 UTC 2011
Modified Files:
src/sys/nfs [netbsd-5]: nfs_socket.c
Log Message:
Pull up following revision(s) (requested by tls in ticket #1583):
sys/nfs/nfs_socket.c: revision 1.186
nfs_msg: #if 0 out tprintf for now and comment why.
To generate a diff of this commit:
cvs rdiff -u -r1.173.4.7 -r1.173.4.8 src/sys/nfs/nfs_socket.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/nfs/nfs_socket.c
diff -u src/sys/nfs/nfs_socket.c:1.173.4.7 src/sys/nfs/nfs_socket.c:1.173.4.8
--- src/sys/nfs/nfs_socket.c:1.173.4.7 Tue Mar 29 19:38:56 2011
+++ src/sys/nfs/nfs_socket.c Tue Mar 29 19:47:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_socket.c,v 1.173.4.7 2011/03/29 19:38:56 riz Exp $ */
+/* $NetBSD: nfs_socket.c,v 1.173.4.8 2011/03/29 19:47:37 riz Exp $ */
/*
* Copyright (c) 1989, 1991, 1993, 1995
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.173.4.7 2011/03/29 19:38:56 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nfs_socket.c,v 1.173.4.8 2011/03/29 19:47:37 riz Exp $");
#include "fs_nfs.h"
#include "opt_nfs.h"
@@ -2190,9 +2190,11 @@
{
tpr_t tpr;
+#if 0 /* XXX nfs_timer can't block on proc_lock */
if (l)
tpr = tprintf_open(l->l_proc);
else
+#endif
tpr = NULL;
tprintf(tpr, "nfs server %s: %s\n", server, msg);
tprintf_close(tpr);
