From patchwork Fri Jan 29 14:50:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 43916 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 0DD99B7D09 for ; Sat, 30 Jan 2010 01:53:12 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NasC6-00015U-27; Fri, 29 Jan 2010 14:51:34 +0000 Received: from mail-bw0-f212.google.com ([209.85.218.212]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NasBx-0000xv-Fu for linux-mtd@lists.infradead.org; Fri, 29 Jan 2010 14:51:30 +0000 Received: by mail-bw0-f212.google.com with SMTP id 4so1893029bwz.2 for ; Fri, 29 Jan 2010 06:51:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=Zz3lwoGbXABwWUZWW3ju5kJbLmehitjNdNn/N0YcOvQ=; b=ZlpIDZ/doZHGcTPgq3u4BjasrZcP2RojYAJb4y6WlVAMDSJqXM/FXRDI+yIMzOB65T RZWSRR778iDnf3vxWT5oRNXenLwfGp5k7j213iklRHyXGkSnGyeCUw3AaP8h2krnq1bN fRZktv5KvUUb29BbDF7v01Z9aQVS9Qz8XY/ss= 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=IEHmcwqdT84+inRL31BJW8DD9V6mkiMJtnQOI04AIW1UYQ0z19crlN0eEXszlL+0BZ TynXlrNnCtHzI9GHunVfmjUJ1gehABZPaVJxXEfmfQ6+VChd+v+3lNpP0uqzMcGu6YzG awcMkQuf+t/riABd7qbXmhQuL1jZuBK4YzKH4= Received: by 10.204.6.72 with SMTP id 8mr448425bky.28.1264776684941; Fri, 29 Jan 2010 06:51:24 -0800 (PST) Received: from localhost.localdomain (IGLD-84-229-248-49.inter.net.il [84.229.248.49]) by mx.google.com with ESMTPS id 16sm937528bwz.3.2010.01.29.06.51.23 (version=SSLv3 cipher=RC4-MD5); Fri, 29 Jan 2010 06:51:24 -0800 (PST) From: Maxim Levitsky To: linux-mtd Subject: [PATCH 06/16] blktrans: flush all requests before we remove the device Date: Fri, 29 Jan 2010 16:50:53 +0200 Message-Id: <1264776663-7042-7-git-send-email-maximlevitsky@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1264776663-7042-1-git-send-email-maximlevitsky@gmail.com> References: <1264776663-7042-1-git-send-email-maximlevitsky@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100129_095125_669263_C30964BF X-CRM114-Status: GOOD ( 15.18 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- _SUMMARY_ Cc: Maxim Levitsky X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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);