From patchwork Thu Apr 1 06:13:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 49188 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 92E91B7D11 for ; Thu, 1 Apr 2010 17:13:46 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753343Ab0DAGNp (ORCPT ); Thu, 1 Apr 2010 02:13:45 -0400 Received: from ringil.hengli.com.au ([216.59.3.182]:53848 "EHLO arnor.apana.org.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753198Ab0DAGNo (ORCPT ); Thu, 1 Apr 2010 02:13:44 -0400 Received: from gondolin.me.apana.org.au ([192.168.0.6]) by arnor.apana.org.au with esmtp (Exim 4.63 #1 (Debian)) id 1NxDet-0000U1-Au; Thu, 01 Apr 2010 17:13:39 +1100 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.69) (envelope-from ) id 1NxDet-0005VO-5a; Thu, 01 Apr 2010 14:13:39 +0800 Date: Thu, 1 Apr 2010 14:13:39 +0800 From: Herbert Xu To: Tejun Heo Cc: "David S. Miller" , linux-ide@vger.kernel.org Subject: v2: ide: Must hold queue lock when requeueing Message-ID: <20100401061339.GA21145@gondor.apana.org.au> References: <20100331061731.GA11480@gondor.apana.org.au> <20100331062029.GA11559@gondor.apana.org.au> <4BB40DD0.6050306@kernel.org> <20100401061159.GA21077@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100401061159.GA21077@gondor.apana.org.au> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org On Thu, Apr 01, 2010 at 02:11:59PM +0800, Herbert Xu wrote: > > OK, here are the two patches again using ide_requeue_and_plug. ide: Must hold queue lock when requeueing ide-atapi requeues requests without holding the queue lock. This patch fixes it by using ide_requeue_and_plug. Signed-off-by: Herbert Xu Cheers, diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index eb2181a..9aedb9a 100644 --- a/drivers/ide/ide-atapi.c +++ b/drivers/ide/ide-atapi.c @@ -263,8 +263,8 @@ void ide_retry_pc(ide_drive_t *drive) * of it. The failed command will be retried after sense data * is acquired. */ - blk_requeue_request(failed_rq->q, failed_rq); drive->hwif->rq = NULL; + ide_requeue_and_plug(drive, failed_rq); if (ide_queue_sense_rq(drive, pc)) { blk_start_request(failed_rq); ide_complete_rq(drive, -EIO, blk_rq_bytes(failed_rq));