From owner-cvs-src@FreeBSD.ORG Sun Apr 23 16:25:31 2006 Return-Path: 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 C579B16A405; Sun, 23 Apr 2006 16:25:31 +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 7F97343D46; Sun, 23 Apr 2006 16:25:31 +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 k3NGPVYT007681; Sun, 23 Apr 2006 16:25:31 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3NGPVm5007680; Sun, 23 Apr 2006 16:25:31 GMT (envelope-from rwatson) Message-Id: <200604231625.k3NGPVm5007680@repoman.freebsd.org> From: Robert Watson Date: Sun, 23 Apr 2006 16:25:30 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/netnatm natm.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Apr 2006 16:25:31 -0000 rwatson 2006-04-23 16:25:30 UTC FreeBSD src repository Modified files: sys/netnatm natm.c Log: Eliminate unnecessary use of labels in error unwinding cases; result is the same number or fewer lines of code. Don't cast using caddr_t. Remember to unlock the natm lock in some error cases where it was leaked previously. Annotate two cases where we'd like to hold the natm subsystem lock over ioctls into the device driver. Hold the natm lock longer in natm_usr_connect() so we can copy the npcb fields while holding the mutex. MFC after: 3 months Revision Changes Path 1.46 +26 -35 src/sys/netnatm/natm.c