From owner-cvs-all@FreeBSD.ORG  Mon Jun  2 12:25:06 2003
Return-Path: <owner-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 72BFD37B405; Mon,  2 Jun 2003 12:25:06 -0700 (PDT)
Received: from critter.freebsd.dk (critter.freebsd.dk [212.242.86.163])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 563A543FDF; Mon,  2 Jun 2003 12:25:03 -0700 (PDT)
	(envelope-from phk@phk.freebsd.dk)
Received: from critter.freebsd.dk (localhost [127.0.0.1])
	by critter.freebsd.dk (8.12.9/8.12.9) with ESMTP id h52JP1nA014256;
	Mon, 2 Jun 2003 21:25:01 +0200 (CEST)
	(envelope-from phk@phk.freebsd.dk)
To: John Baldwin <jhb@FreeBSD.org>
From: "Poul-Henning Kamp" <phk@phk.freebsd.dk>
In-Reply-To: Your message of "Mon, 02 Jun 2003 15:23:10 EDT."
             <XFMail.20030602152310.jhb@FreeBSD.org> 
Date: Mon, 02 Jun 2003 21:25:00 +0200
Message-ID: <14255.1054581900@critter.freebsd.dk>
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/kern subr_witness.c 
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jun 2003 19:25:07 -0000

In message <XFMail.20030602152310.jhb@FreeBSD.org>, John Baldwin writes:
>
>On 31-May-2003 Poul-Henning Kamp wrote:
>> phk         2003/05/31 13:09:42 PDT
>> 
>>   FreeBSD src repository
>> 
>>   Modified files:
>>     sys/kern             subr_witness.c 
>>   Log:
>>   Remove return after panic.
>>   
>>   Found by:       FlexeLint
>
>revision 1.90
>date: 2001/11/15 19:46:36;  author: jhb;  state: Exp;  lines: +7 -3
>Add a couple of returns to making recovering from a failed witness_assert()
>more sane in the RESTARTABLE_PANICS case.
>
>They were intentional, though perhaps they should have been wrapped
>in #ifdef RESTARTABLE_PANICS.  cvs annotate is your friend. :)

That would be the correct solution.

-- 
Poul-Henning Kamp       | UNIX since Zilog Zeus 3.20
phk@FreeBSD.ORG         | TCP/IP since RFC 956
FreeBSD committer       | BSD since 4.3-tahoe    
Never attribute to malice what can adequately be explained by incompetence.