From owner-svn-src-head@FreeBSD.ORG  Mon Jul  8 21:26:15 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 7755171C;
 Mon,  8 Jul 2013 21:26:15 +0000 (UTC) (envelope-from jhb@freebsd.org)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
 by mx1.freebsd.org (Postfix) with ESMTP id 532A61A15;
 Mon,  8 Jul 2013 21:26:15 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id B9B8FB9C2;
 Mon,  8 Jul 2013 17:26:14 -0400 (EDT)
From: John Baldwin <jhb@freebsd.org>
To: Alfred Perlstein <alfred@freebsd.org>
Subject: Re: svn commit: r253007 - in head/sys: kern net80211 sys
Date: Mon, 8 Jul 2013 16:20:02 -0400
User-Agent: KMail/1.13.5 (FreeBSD/8.2-CBSD-20110714-p25; KDE/4.5.5; amd64; ; )
References: <201307072139.r67Ldb6u046408@svn.freebsd.org>
In-Reply-To: <201307072139.r67Ldb6u046408@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <201307081620.02262.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (bigwig.baldwin.cx); Mon, 08 Jul 2013 17:26:14 -0400 (EDT)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jul 2013 21:26:15 -0000

On Sunday, July 07, 2013 5:39:37 pm Alfred Perlstein wrote:
> Author: alfred
> Date: Sun Jul  7 21:39:37 2013
> New Revision: 253007
> URL: http://svnweb.freebsd.org/changeset/base/253007
> 
> Log:
>   Make kassert_printf use __printflike.
>   
>   Fix associated errors/warnings while I'm here.
>   
>   Requested by: avg
> 
> Modified:
>   head/sys/kern/subr_witness.c
>   head/sys/kern/vfs_bio.c
>   head/sys/net80211/ieee80211_output.c
>   head/sys/sys/systm.h
> 
> Modified: head/sys/kern/subr_witness.c
> 
==============================================================================
> --- head/sys/kern/subr_witness.c	Sun Jul  7 21:23:58 2013	(r253006)
> +++ head/sys/kern/subr_witness.c	Sun Jul  7 21:39:37 2013	(r253007)
> @@ -1138,12 +1138,16 @@ witness_checkorder(struct lock_object *l
>  		iclass = LOCK_CLASS(interlock);
>  		lock1 = find_instance(lock_list, interlock);
>  		if (lock1 == NULL)
> -			kassert_panic("interlock (%s) %s not locked @ %s:%d",
> +			kassert_panic(
> +			    "interlock (%s) %s not locked while locking"
> +			    " %s @ %s:%d",
>  			    iclass->lc_name, interlock->lo_name,
>  			    flags & LOP_EXCLUSIVE ? "exclusive" : "shared",
>  			    fixup_filename(file), line);
>  		else if ((lock1->li_flags & LI_RECURSEMASK) != 0)
> -			kassert_panic("interlock (%s) %s recursed @ %s:%d",
> +			kassert_panic(
> +			    "interlock (%s) %s recursed while locking %s"
> +			    " @ %s:%d",
>  			    iclass->lc_name, interlock->lo_name,
>  			    flags & LOP_EXCLUSIVE ? "exclusive" : "shared",
>  			    fixup_filename(file), line);

Eh, this isn't really correct.  Better to remove the useless
"exclusive"/"shared" string argument.  That was a copy/paste bug on my part.

-- 
John Baldwin