From owner-cvs-all@FreeBSD.ORG Thu Oct 21 09:01:03 2004 Return-Path: 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 2513516A4CF; Thu, 21 Oct 2004 09:01:03 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1882D43D49; Thu, 21 Oct 2004 09:01:03 +0000 (GMT) (envelope-from rwatson@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i9L9125X029069; Thu, 21 Oct 2004 09:01:02 GMT (envelope-from rwatson@repoman.freebsd.org) Received: (from rwatson@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i9L912TA029068; Thu, 21 Oct 2004 09:01:02 GMT (envelope-from rwatson) Message-Id: <200410210901.i9L912TA029068@repoman.freebsd.org> From: Robert Watson Date: Thu, 21 Oct 2004 09:01:02 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: RELENG_5_3 Subject: cvs commit: src/sys/nfsserver nfs_serv.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 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, 21 Oct 2004 09:01:03 -0000 rwatson 2004-10-21 09:01:02 UTC FreeBSD src repository Modified files: (Branch: RELENG_5_3) sys/nfsserver nfs_serv.c Log: Merge nfs_serv.c:1.149 (RELENG_5 1.147.2.2) from HEAD to RELENG_5_3: date: 2004/10/18 11:23:11; author: rwatson; state: Exp; lines: +61 -13 Correct several instances where calls to vfs_getvfs() resulting in failure in the NFS server would result in a leaked instance of the NFS server subsystem lock. Liberally sprinkle assertions in all target labels for error unwinding to assert the desired locking state. RELENG_5_3 candidate. MFC after: 3 days Reported by: Wilkinson, Alex Approved by: re (scottl) Revision Changes Path 1.147.2.1.2.1 +61 -13 src/sys/nfsserver/nfs_serv.c