From owner-freebsd-firewire@FreeBSD.ORG Wed Dec 12 02:37:14 2007 Return-Path: Delivered-To: freebsd-firewire@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 34BE216A41A for ; Wed, 12 Dec 2007 02:37:14 +0000 (UTC) (envelope-from freebsd@gm.nunu.org) Received: from nz-out-0506.google.com (nz-out-0506.google.com [64.233.162.238]) by mx1.freebsd.org (Postfix) with ESMTP id 0068A13C469 for ; Wed, 12 Dec 2007 02:37:13 +0000 (UTC) (envelope-from freebsd@gm.nunu.org) Received: by nz-out-0506.google.com with SMTP id l8so41921nzf.13 for ; Tue, 11 Dec 2007 18:37:13 -0800 (PST) Received: by 10.142.131.18 with SMTP id e18mr17039wfd.207.1197427032495; Tue, 11 Dec 2007 18:37:12 -0800 (PST) Received: by 10.142.224.12 with HTTP; Tue, 11 Dec 2007 18:37:12 -0800 (PST) Message-ID: <626eb4530712111837y4608e919w845461d36a18118f@mail.gmail.com> Date: Wed, 12 Dec 2007 11:37:12 +0900 From: "Hidetoshi Shimokawa" Sender: freebsd@gm.nunu.org To: "Sean Bruno" In-Reply-To: <1197425759.14437.0.camel@home-desk> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <1197420795.2738.6.camel@iago.office.miralink.com> <86sl28snpe.wl%simokawa@FreeBSD.ORG> <1197425759.14437.0.camel@home-desk> X-Google-Sender-Auth: e0f3cb1d7a16183e Cc: freebsd-scsi@freebsd.org, freebsd-firewire@freebsd.org, nate@root.org Subject: Re: scsi_target witness lock error X-BeenThere: freebsd-firewire@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Firewire support in FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 02:37:14 -0000 On 12/12/07, Sean Bruno wrote: > > --- //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 Yes, it is same as comment out. The patch was for RELENG_7 or current. I'm not sure about RELENG_6. -- /\ Hidetoshi Shimokawa \/ simokawa@FreeBSD.ORG