From owner-cvs-all@FreeBSD.ORG Thu Jun 8 23:37:16 2006 Return-Path: X-Original-To: cvs-all@FreeBSD.org Delivered-To: cvs-all@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9F37E16A41B; Thu, 8 Jun 2006 23:37:16 +0000 (UTC) (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 DD33B43D72; Thu, 8 Jun 2006 23:37:15 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k58NZGWp087019; Thu, 8 Jun 2006 23:35:16 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k58NZGoj087018; Thu, 8 Jun 2006 23:35:16 GMT (envelope-from rwatson) Message-Id: <200606082335.k58NZGoj087018@repoman.freebsd.org> From: Robert Watson Date: Thu, 8 Jun 2006 23:35:16 +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/netipx spx_usrreq.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jun 2006 23:37:16 -0000 rwatson 2006-06-08 23:35:16 UTC FreeBSD src repository Modified files: (Branch: RELENG_6) sys/netipx spx_usrreq.c Log: Merge spx_usrreq.c:1.82 from HEAD to RELENG_6: In spx_output(), use M_DONTWAIT instead of M_TRYWAIT, as we hold the ipxpcb mutex. Contrary to the comment, even in 4.x this was unsafe, as parallel use of the socket by another process would result in pcb corruption if the mbuf allocation slept. Revision Changes Path 1.62.2.18 +6 -5 src/sys/netipx/spx_usrreq.c