From owner-cvs-src@FreeBSD.ORG  Thu Sep 29 18:40:36 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E19D016A420;
	Thu, 29 Sep 2005 18:40:36 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7ACC943D5A;
	Thu, 29 Sep 2005 18:40:36 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j8TIeanU061811;
	Thu, 29 Sep 2005 18:40:36 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j8TIeaKK061810;
	Thu, 29 Sep 2005 18:40:36 GMT (envelope-from rwatson)
Message-Id: <200509291840.j8TIeaKK061810@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 29 Sep 2005 18:40:36 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_6
Cc: 
Subject: cvs commit: src/sys/kern subr_prf.c src/sys/nfsclient nfs_socket.c
 src/sys/rpc rpcclnt.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Sep 2005 18:40:37 -0000

rwatson     2005-09-29 18:40:36 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_6)
    sys/kern             subr_prf.c 
    sys/nfsclient        nfs_socket.c 
    sys/rpc              rpcclnt.c 
  Log:
  Merge subr_prof.c:1.119, 1.120, 1.121, nfs_socket.c:1.130,
  rpcclnt.c:1.14 from HEAD to RELENG_6:
  
  Acquire Giant in uprintf() and tprintf() due to the non-MPSAFEty of
  the tty code invoked from these functions.  In two cases, during
  timeout handling in NFS-related RPC client code, acquire Giant in
  the caller before other mutexes the caller might hold, in order to
  avoid lock order reversals with Giant (a recursive acquire is not
  a reversal as it won't ever wait).
  
  Correct age-old comments about uprintf()/tprintf() sleeping: they
  will never sleep.
  
  Much useful feedback from:      bde
  Approved by:                    re (scottl)
  
  Revision   Changes    Path
  1.116.2.2  +13 -8     src/sys/kern/subr_prf.c
  1.125.2.2  +13 -1     src/sys/nfsclient/nfs_socket.c
  1.13.2.1   +8 -1      src/sys/rpc/rpcclnt.c