From owner-freebsd-scsi@FreeBSD.ORG  Wed Dec 12 02:18:55 2007
Return-Path: <owner-freebsd-scsi@FreeBSD.ORG>
Delivered-To: freebsd-scsi@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4217316A419;
	Wed, 12 Dec 2007 02:18:55 +0000 (UTC)
	(envelope-from sbruno@miralink.com)
Received: from plato.miralink.com (mail.miralink.com [70.103.185.20])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E3CD13C468;
	Wed, 12 Dec 2007 02:18:54 +0000 (UTC)
	(envelope-from sbruno@miralink.com)
Received: from localhost (localhost.localdomain [127.0.0.1])
	by plato.miralink.com (Postfix) with ESMTP id A82F661B012;
	Tue, 11 Dec 2007 18:18:54 -0800 (PST)
Received: from plato.miralink.com ([127.0.0.1])
	by localhost (plato.miralink.com [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 06578-06; Tue, 11 Dec 2007 18:18:53 -0800 (PST)
Received: from [10.47.1.50] (vpn.office.miralink.com [10.0.0.5])
	by plato.miralink.com (Postfix) with ESMTP id 8F65161B006;
	Tue, 11 Dec 2007 18:18:53 -0800 (PST)
From: Sean Bruno <sbruno@miralink.com>
To: Hidetoshi Shimokawa <simokawa@FreeBSD.ORG>
In-Reply-To: <86sl28snpe.wl%simokawa@FreeBSD.ORG>
References: <1197420795.2738.6.camel@iago.office.miralink.com>
	<86sl28snpe.wl%simokawa@FreeBSD.ORG>
Content-Type: text/plain
Date: Tue, 11 Dec 2007 18:15:59 -0800
Message-Id: <1197425759.14437.0.camel@home-desk>
Mime-Version: 1.0
X-Mailer: Evolution 2.12.2 (2.12.2-2.fc8) 
Content-Transfer-Encoding: 7bit
X-DSPAM-Result: Innocent
X-DSPAM-Processed: Tue Dec 11 18:18:54 2007
X-DSPAM-Confidence: 0.9997
X-DSPAM-Probability: 0.0000
X-DSPAM-Signature: 475f450e260141804284693
X-DSPAM-Factors: 27,
X-Virus-Scanned: amavisd-new at 
X-Spam-Status: No, score=-4.499 tagged_above=-10 required=6.6 autolearn=ham
	tests=[ALL_TRUSTED=-1.8, BAYES_00=-2.599, DSPAM_HAM=-0.1]
X-Spam-Score: -4.499
X-Spam-Level: 
Cc: freebsd-scsi@freebsd.org, freebsd-firewire@freebsd.org, nate@root.org
Subject: Re: scsi_target witness lock error
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, 12 Dec 2007 02:18:55 -0000

> --- //depot/vendor/freebsd/src/sys/cam/scsi/scsi_target.c	2007/04/15 08:53:22
> +++ //depot/user/simokawa/firewire_lock/sys/cam/scsi/scsi_target.c	2007/05/21 14:31:55
> @@ -372,10 +372,14 @@
>  	int	retval;
>  
>  	softc = (struct targ_softc *)kn->kn_hook;
> +#if 0
>  	cam_periph_lock(softc->periph);
> +#endif
>  	retval = !TAILQ_EMPTY(&softc->user_ccb_queue) ||
>  		 !TAILQ_EMPTY(&softc->abort_queue);
> +#if 0
>  	cam_periph_unlock(softc->periph);
> +#endif
>  	return (retval);
>  }
Are these two "if 0"'s supposed to be commented out?  I'm leaving this
out of my RELENG_6 test for now unless you say otherwise.


Sean