From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fg-out-1718.google.com ([72.14.220.158]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NbEqu-0006Ex-W0 for linux-mtd@lists.infradead.org; Sat, 30 Jan 2010 15:03:23 +0000 Received: by fg-out-1718.google.com with SMTP id 16so49893fgg.0 for ; Sat, 30 Jan 2010 07:03:12 -0800 (PST) From: Maxim Levitsky To: David Woodhouse Subject: [PATCH 06/17] blktrans: flush all requests before we remove the device Date: Sat, 30 Jan 2010 17:02:37 +0200 Message-Id: <1264863768-27606-7-git-send-email-maximlevitsky@gmail.com> In-Reply-To: <1264863768-27606-1-git-send-email-maximlevitsky@gmail.com> References: <1264863768-27606-1-git-send-email-maximlevitsky@gmail.com> Cc: Maxim Levitsky , Alex Dubov , Artem Bityutskiy , joern , linux-kernel , linux-mtd , Thomas Gleixner List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 841c6ae..a65eb07 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); } @@ -358,6 +364,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(); @@ -368,7 +376,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