From patchwork Sat Jan 23 00:24:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 43553 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 351B7B7CCD for ; Sat, 23 Jan 2010 11:26:16 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NYToL-0006Es-5q; Sat, 23 Jan 2010 00:25:09 +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 1NYToE-0005j0-NF for linux-mtd@lists.infradead.org; Sat, 23 Jan 2010 00:25:07 +0000 Received: by bwz4 with SMTP id 4so1646175bwz.2 for ; Fri, 22 Jan 2010 16:25:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=OEy5R0PypU4z9MeLyK0ie0BxYHU31/7KMOzGjiipnVg=; b=qeWxkIHSyZCGxBPA9e5PYkA8emPtrz5wxq855b0g9xZFbsSzFrrFSP8WKdxw+MUgM8 1VIhQjCyOZVLxDuOjVuz7C1+jCKZmSEva8RsSkfzx9cc/Kw8lQ7Ge81RnE/u229ygwmZ 1fiCUzn++uj0aF5BIMQjjpWgmH2Me9yB/gzWY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=kX5IWtUDda7B9NMfnECPknUA5j6xH0ImU9uqViF9fEIkLOQ7Luoj16H7KW0RTjcG2I qlAeQInhvfvpBqMTGxvj11ss90j8GM4NWNRR0yYRMr1mFlGHPom2yAOVPZ06v85ppBMd BocSDnoEisIOtTr/Iexp05eGEtE7hTET8/yy8= Received: by 10.204.25.197 with SMTP id a5mr2044711bkc.70.1264206301398; Fri, 22 Jan 2010 16:25:01 -0800 (PST) Received: from ?10.1.0.2? ([87.70.246.165]) by mx.google.com with ESMTPS id 16sm1239687bwz.15.2010.01.22.16.24.59 (version=SSLv3 cipher=RC4-MD5); Fri, 22 Jan 2010 16:25:00 -0800 (PST) Subject: [PATCH 6/8] blktrans: flush all requests before we remove the device From: Maxim Levitsky To: Artem Bityutskiy In-Reply-To: <1264205925.31827.3.camel@maxim-laptop> References: <1264205925.31827.3.camel@maxim-laptop> Date: Sat, 23 Jan 2010 02:24:58 +0200 Message-ID: <1264206298.31827.10.camel@maxim-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100122_192503_260785_ED6DEB48 X-CRM114-Status: GOOD ( 17.82 ) 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: Alex Dubov , joern , linux-kernel , linux-mtd , Thomas Gleixner , David Woodhouse 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: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org >From 6d5a70a18bea40bfc354e73d7fde5042465fc534 Mon Sep 17 00:00:00 2001 From: Maxim Levitsky Date: Sat, 23 Jan 2010 02:09:11 +0200 Subject: [PATCH 6/8] blktrans: flush all requests before we remove the device 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 f165115..33bdef1 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); } @@ -359,6 +365,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(); @@ -369,7 +377,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);