From patchwork Wed Mar 31 06:20:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herbert Xu X-Patchwork-Id: 49084 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 AF441B7C33 for ; Wed, 31 Mar 2010 17:55:30 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751831Ab0CaGz2 (ORCPT ); Wed, 31 Mar 2010 02:55:28 -0400 Received: from ringil.hengli.com.au ([216.59.3.182]:42561 "EHLO arnor.apana.org.au" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754881Ab0CaGz1 (ORCPT ); Wed, 31 Mar 2010 02:55:27 -0400 X-Greylist: delayed 2262 seconds by postgrey-1.27 at vger.kernel.org; Wed, 31 Mar 2010 02:55:26 EDT Received: from gondolin.me.apana.org.au ([192.168.0.6]) by arnor.apana.org.au with esmtp (Exim 4.63 #1 (Debian)) id 1NwrHy-0005wh-IC; Wed, 31 Mar 2010 17:20:30 +1100 Received: from herbert by gondolin.me.apana.org.au with local (Exim 4.69) (envelope-from ) id 1NwrHx-000310-VQ; Wed, 31 Mar 2010 14:20:30 +0800 Date: Wed, 31 Mar 2010 14:20:29 +0800 From: Herbert Xu To: "David S. Miller" , Tejun Heo , linux-ide@vger.kernel.org Subject: ide: Must hold queue lock when requeueing Message-ID: <20100331062029.GA11559@gondor.apana.org.au> References: <20100331061731.GA11480@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20100331061731.GA11480@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 ide: Must hold queue lock when requeueing ide-atapi requeues requests without holding the queue lock. This patch fixes it by using the new ide_requeue_request function. Signed-off-by: Herbert Xu Cheers, diff --git a/drivers/ide/ide-atapi.c b/drivers/ide/ide-atapi.c index eb2181a..12e9d7c 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_request(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));