From owner-freebsd-scsi@FreeBSD.ORG  Wed Dec  2 13:59:23 2009
Return-Path: <owner-freebsd-scsi@FreeBSD.ORG>
Delivered-To: scsi@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 59959106566B
	for <scsi@freebsd.org>; Wed,  2 Dec 2009 13:59:23 +0000 (UTC)
	(envelope-from jh@FreeBSD.org)
Received: from gw01.mail.saunalahti.fi (gw01.mail.saunalahti.fi
	[195.197.172.115])
	by mx1.freebsd.org (Postfix) with ESMTP id 1BCD38FC15
	for <scsi@freebsd.org>; Wed,  2 Dec 2009 13:59:23 +0000 (UTC)
Received: from a91-153-117-195.elisa-laajakaista.fi
	(a91-153-117-195.elisa-laajakaista.fi [91.153.117.195])
	by gw01.mail.saunalahti.fi (Postfix) with SMTP id 202D1151339;
	Wed,  2 Dec 2009 15:59:19 +0200 (EET)
Date: Wed, 2 Dec 2009 15:59:19 +0200
From: Jaakko Heinonen <jh@FreeBSD.org>
To: Scott Long <scottl@samsco.org>
Message-ID: <20091202135919.GA3675@a91-153-117-195.elisa-laajakaista.fi>
References: <20091201180524.GB7961@a91-153-117-195.elisa-laajakaista.fi>
	<20091201142930.I99667@pooker.samsco.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20091201142930.I99667@pooker.samsco.org>
User-Agent: Mutt/1.5.19 (2009-01-05)
Cc: scsi@freebsd.org
Subject: Re: cd(4) M_WAITOK allocations with periph lock held
X-BeenThere: freebsd-scsi@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SCSI subsystem <freebsd-scsi.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-scsi>,
	<mailto:freebsd-scsi-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-scsi>
List-Post: <mailto:freebsd-scsi@freebsd.org>
List-Help: <mailto:freebsd-scsi-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-scsi>,
	<mailto:freebsd-scsi-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 02 Dec 2009 13:59:23 -0000


Hi,

On 2009-12-01, Scott Long wrote:
> How about the attached match instead.  It refactors the code so that 
> unlocks aren't needed.

Looks OK to me. Some nits below.

>  bailout:
> +	xpt_release_ccb(ccb);
> +	cam_periph_unlock(periph);
> +

The file seems to have an empty line after labels in other places. Maybe
put one here too.

>  bailout:
>  
> +	xpt_release_ccb(ccb);
> +	cam_periph_unlock(periph);

You can remove the now unused "bailout:" label from cdsendkey().

Do you want to commit it?

Thanks.
-- 
Jaakko