From owner-freebsd-hackers Wed Aug 8 7:54: 3 2001 Delivered-To: freebsd-hackers@freebsd.org Received: from mail.wrs.com (unknown-1-11.windriver.com [147.11.1.11]) by hub.freebsd.org (Postfix) with ESMTP id 9F56837B406 for ; Wed, 8 Aug 2001 07:53:58 -0700 (PDT) (envelope-from jhb@FreeBSD.org) Received: from laptop.baldwin.cx (john@[147.11.46.201]) by mail.wrs.com (8.9.3/8.9.1) with ESMTP id HAA17988 for ; Wed, 8 Aug 2001 07:53:58 -0700 (PDT) Message-ID: X-Mailer: XFMail 1.4.0 on FreeBSD X-Priority: 3 (Normal) Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 8bit MIME-Version: 1.0 Date: Wed, 08 Aug 2001 07:53:59 -0700 (PDT) From: John Baldwin To: hackers@FreeBSD.org Subject: [PATCH] Change lockmgr() to not recursively panic Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG Any objections to the following patch? Index: kern_lock.c =================================================================== RCS file: /usr/cvs/src/sys/kern/kern_lock.c,v retrieving revision 1.46 diff -u -r1.46 kern_lock.c --- kern_lock.c 2001/04/28 12:11:01 1.46 +++ kern_lock.c 2001/08/07 22:06:30 @@ -242,6 +242,11 @@ mtx_unlock(interlkp); } + if (panicstr != NULL) { + mtx_unlock(lkp->lk_interlock); + return (0); + } + extflags = (flags | lkp->lk_flags) & LK_EXTFLG_MASK; switch (flags & LK_TYPE_MASK) { -- John Baldwin -- http://www.FreeBSD.org/~jhb/ PGP Key: http://www.baldwin.cx/~john/pgpkey.asc "Power Users Use the Power to Serve!" - http://www.FreeBSD.org/ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message