From owner-cvs-all@FreeBSD.ORG  Sat Oct 18 12:13:12 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 B68AB16A4C0
	for <cvs-all@FreeBSD.org>; Sat, 18 Oct 2003 12:13:12 -0700 (PDT)
Received: from rootlabs.com (root.org [67.118.192.226])
	by mx1.FreeBSD.org (Postfix) with SMTP id C2C9043FBF
	for <cvs-all@FreeBSD.org>; Sat, 18 Oct 2003 12:13:08 -0700 (PDT)
	(envelope-from nate@rootlabs.com)
Received: (qmail 47155 invoked by uid 1000); 18 Oct 2003 19:13:09 -0000
Date: Sat, 18 Oct 2003 12:13:09 -0700 (PDT)
From: Nate Lawson <nate@root.org>
To: Poul-Henning Kamp <phk@FreeBSD.org>
In-Reply-To: <20031018093315.22C3C16A554@hub.freebsd.org>
Message-ID: <20031018121152.V47115@root.org>
References: <20031018093315.22C3C16A554@hub.freebsd.org>
MIME-Version: 1.0
Content-Type: TEXT/PLAIN; charset=US-ASCII
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@FreeBSD.org
Subject: Re: cvs commit: src/sys/kern vfs_bio.c src/sys/fs/nwfs nwfs_vnops.c
 src/sys/fs/smbfs smbfs_vnops.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: Sat, 18 Oct 2003 19:13:12 -0000

On Sat, 18 Oct 2003, Poul-Henning Kamp wrote:
>   Modified files:
>     sys/kern             vfs_bio.c
>     sys/fs/nwfs          nwfs_vnops.c
>     sys/fs/smbfs         smbfs_vnops.c
>   Log:
>   Convert some if(bla) panic("foo") to KASSERTS to improve grep-ability.
>
>   Revision  Changes    Path
>   1.29      +1 -2      src/sys/fs/nwfs/nwfs_vnops.c
>   1.41      +1 -2      src/sys/fs/smbfs/smbfs_vnops.c
>   1.414     +2 -4      src/sys/kern/vfs_bio.c
>
>
> Index: src/sys/fs/nwfs/nwfs_vnops.c
> diff -u src/sys/fs/nwfs/nwfs_vnops.c:1.28 src/sys/fs/nwfs/nwfs_vnops.c:1.29
> --- src/sys/fs/nwfs/nwfs_vnops.c:1.28	Sun Jun 15 11:52:58 2003
> +++ src/sys/fs/nwfs/nwfs_vnops.c	Sat Oct 18 02:32:39 2003
> @@ -799,8 +799,7 @@
>  	KASSERT(ap->a_vp == ap->a_bp->b_vp, ("%s(%p != %p)",
>  	    __func__, ap->a_vp, ap->a_bp->b_vp));
>  	NCPVNDEBUG("\n");
> -	if (bp->b_flags & B_PHYS)
> -		panic("nwfs physio");
> +	KASSERT(!(bp->b_flags & B_PHYS), ("nwfs physio"));
>  	if (bp->b_flags & B_ASYNC)
>  		td = (struct thread *)0;
>  	else

This removes sanity checks for the !INVARIANTS case (which all our
releases are).

-Nate