From owner-freebsd-scsi@FreeBSD.ORG Wed Dec 12 03:33:02 2007 Return-Path: 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 3A66C16A498; Wed, 12 Dec 2007 03:33:02 +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 0E3AA13C467; Wed, 12 Dec 2007 03:33:01 +0000 (UTC) (envelope-from sbruno@miralink.com) Received: from localhost (localhost.localdomain [127.0.0.1]) by plato.miralink.com (Postfix) with ESMTP id BA92161B012; Tue, 11 Dec 2007 19:33:01 -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 25746-01; Tue, 11 Dec 2007 19:32:58 -0800 (PST) Received: from [10.47.1.50] (vpn.office.miralink.com [10.0.0.5]) by plato.miralink.com (Postfix) with ESMTP id 624D661B006; Tue, 11 Dec 2007 19:32:58 -0800 (PST) Message-ID: <475F5669.1010800@miralink.com> Date: Tue, 11 Dec 2007 19:32:57 -0800 From: Sean Bruno User-Agent: Thunderbird 2.0.0.9 (X11/20071115) MIME-Version: 1.0 To: Hidetoshi Shimokawa References: <1197420795.2738.6.camel@iago.office.miralink.com> <86sl28snpe.wl%simokawa@FreeBSD.ORG> <1197425759.14437.0.camel@home-desk> <626eb4530712111837y4608e919w845461d36a18118f@mail.gmail.com> In-Reply-To: <626eb4530712111837y4608e919w845461d36a18118f@mail.gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-DSPAM-Result: Innocent X-DSPAM-Processed: Tue Dec 11 19:32:59 2007 X-DSPAM-Confidence: 0.9997 X-DSPAM-Probability: 0.0000 X-DSPAM-Signature: 475f566b300065260519334 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Dec 2007 03:33:02 -0000 Hidetoshi Shimokawa wrote: > 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. > > Ok, I merged the patch(RELENG_6) to the best of my ability. The system now panics and has the same witness error. panic/witness/trace --> http://consultcsg.com/scsitarget_witness.txt scsi_target.c diff --> http://consultcsg.com/scsi_target.c.diff Sean