Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933007Ab0BDXeJ (ORCPT ); Thu, 4 Feb 2010 18:34:09 -0500 Received: from fg-out-1718.google.com ([72.14.220.152]:3474 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933158Ab0BDXb1 (ORCPT ); Thu, 4 Feb 2010 18:31:27 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=fFMSY9XdkW1NN41pE2td7pI9Uk5QEMDwRNQNUxCQTWMoIGUUhhm5zjgUl6ItyaMTj4 bWHWhkR12RTcgR9vgR7y2ajp/zVjG9znMaDNTPVmpaQKUpcEcrjnabZPIdoMwHhVWmUJ uubYP+gBuAZXgQp/LV6wcNXSwE8jEaB0xKyhg= From: Maxim Levitsky To: David Woodhouse Cc: Artem Bityutskiy , linux-mtd , linux-kernel , Alex Dubov , joern , Thomas Gleixner , Maxim Levitsky Subject: [PATCH 06/17] blktrans: flush all requests before we remove the device Date: Fri, 5 Feb 2010 01:30:46 +0200 Message-Id: <1265326257-4446-7-git-send-email-maximlevitsky@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1265326257-4446-1-git-send-email-maximlevitsky@gmail.com> References: <1265326257-4446-1-git-send-email-maximlevitsky@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1651 Lines: 56 Flush all requests, so we can be sure we don't deadlock the system later when we remove the disk queue. Signed-off-by: Maxim Levitsky --- drivers/mtd/mtd_blkdevs.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index 082969c..9992b2d 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c @@ -115,7 +115,13 @@ static int mtd_blktrans_thread(void *arg) static void mtd_blktrans_request(struct request_queue *rq) { struct mtd_blktrans_dev *dev = rq->queuedata; - wake_up_process(dev->thread); + struct request *req = NULL; + + if (dev->deleted) + while ((req = blk_fetch_request(rq)) != NULL) + __blk_end_request_all(req, -ENODEV); + else + wake_up_process(dev->thread); } @@ -357,6 +363,8 @@ error1: int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old) { + unsigned long flags; + if (mutex_trylock(&mtd_table_mutex)) { mutex_unlock(&mtd_table_mutex); BUG(); @@ -367,7 +375,11 @@ int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old) /* stop new requests to arrive */ del_gendisk(old->disk); + /* flush current requests */ + spin_lock_irqsave(&old->queue_lock, flags); old->deleted = 1; + blk_start_queue(old->rq); + spin_unlock_irqrestore(&old->queue_lock, flags); /* Stop the thread */ kthread_stop(old->thread); -- 1.6.3.3 -- 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/