Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S266128AbUAQTRQ (ORCPT ); Sat, 17 Jan 2004 14:17:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S266129AbUAQTRQ (ORCPT ); Sat, 17 Jan 2004 14:17:16 -0500 Received: from phoenix.infradead.org ([213.86.99.234]:12559 "EHLO phoenix.infradead.org") by vger.kernel.org with ESMTP id S266124AbUAQTRO (ORCPT ); Sat, 17 Jan 2004 14:17:14 -0500 Date: Sat, 17 Jan 2004 19:17:04 +0000 From: Christoph Hellwig To: Doug Ledford Cc: Marcelo Tosatti , Arjan Van de Ven , Martin Peschke3 , Jens Axboe , Peter Yao , linux-kernel@vger.kernel.org, linux-scsi mailing list , ihno@suse.de Subject: Re: smp dead lock of io_request_lock/queue_lock patch Message-ID: <20040117191704.A6344@infradead.org> Mail-Followup-To: Christoph Hellwig , Doug Ledford , Marcelo Tosatti , Arjan Van de Ven , Martin Peschke3 , Jens Axboe , Peter Yao , linux-kernel@vger.kernel.org, linux-scsi mailing list , ihno@suse.de References: <20040112151230.GB5844@devserv.devel.redhat.com> <20040112194829.A7078@infradead.org> <1073937102.3114.300.camel@compaq.xsintricity.com> <1074345000.13198.25.camel@compaq.xsintricity.com> <20040117165828.A4977@infradead.org> <1074366452.13198.48.camel@compaq.xsintricity.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <1074366452.13198.48.camel@compaq.xsintricity.com>; from dledford@redhat.com on Sat, Jan 17, 2004 at 02:07:33PM -0500 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 761 Lines: 24 On Sat, Jan 17, 2004 at 02:07:33PM -0500, Doug Ledford wrote: > #ifdef SCSI_HAS_HOST_LOCK > #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) > adapter->lock_ptr = &adapter->lock; > host->lock = &adapter->lock; > #else > adapter->lock_ptr = &adapter->lock; > host->host_lock = &adapter->lock; > #endif > #else > adapter->lock_ptr = &io_request_lock; > #endif Still looks wrong for the 2.6 case which should just be; adapter->lock_ptr = shost->host_lock; as I just stated in the review for the megaraid update. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/