From patchwork Thu Apr 1 06:13:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: v2: ide: Must hold queue lock when requeueing X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 49188 X-Patchwork-Delegate: davem@davemloft.net Message-Id: <20100401061339.GA21145@gondor.apana.org.au> To: Tejun Heo Cc: "David S. Miller" , linux-ide@vger.kernel.org Date: Thu, 1 Apr 2010 14:13:39 +0800 From: Herbert Xu List-Id: 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));