From patchwork Tue Feb 9 16:57:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 44930 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 0EA93B7D2D for ; Wed, 10 Feb 2010 04:01:26 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NetPx-0003JP-IL; Tue, 09 Feb 2010 16:58:29 +0000 Received: from mail-bw0-f220.google.com ([209.85.218.220]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NetPl-00032c-Bc for linux-mtd@lists.infradead.org; Tue, 09 Feb 2010 16:58:23 +0000 Received: by mail-bw0-f220.google.com with SMTP id 20so2398450bwz.20 for ; Tue, 09 Feb 2010 08:58:17 -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=Bi5iuUI43OeUOiH27h4J6XSVDpOM+EQV6dHYKOJXKL0=; b=tC+JwOnUwuwBaDIp+bUp38CGLbegCvDHaa5t6p3JLpCBjhEN5VYuatB+KnOlIK2n8F Zm/p5RPWOnnP6Ue8RkXh29bP8yWWr1I7nAad6giwQyFFnoMfETU+D/C/xChCYO+I5IE1 ZRXs28qJvlHKQAds8UejijGoT2pwEer6YqZx4= 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=BjKokEdt9vBJ+ELKbXWR5JDSukvw1ibeRfO0TkLs2Dj5zolR8gJ35MGukS/ey5xgpU PPBLjMbbWOd2hMSgA0oMnE1m3QzMFr2mwrQyX0d87SYrYBKpBbgEv87E63sCwP/nd732 MRMt6h5RAxT5/qNOsSXKalezVbo1YLUbRvFBI= Received: by 10.204.14.84 with SMTP id f20mr1864741bka.209.1265734696959; Tue, 09 Feb 2010 08:58:16 -0800 (PST) Received: from localhost.localdomain (87.68.240.235.adsl.012.net.il [87.68.240.235]) by mx.google.com with ESMTPS id 16sm127734bwz.7.2010.02.09.08.58.14 (version=SSLv3 cipher=RC4-MD5); Tue, 09 Feb 2010 08:58:15 -0800 (PST) From: Maxim Levitsky To: David Woodhouse Subject: [PATCH 08/17] MTD: call remove notifiers before removing the device Date: Tue, 9 Feb 2010 18:57:36 +0200 Message-Id: <1265734665-22656-9-git-send-email-maximlevitsky@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1265734665-22656-1-git-send-email-maximlevitsky@gmail.com> References: <1265734665-22656-1-git-send-email-maximlevitsky@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100209_115817_568976_9A57E38A X-CRM114-Status: GOOD ( 16.73 ) 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 , Alex Dubov , Artem Bityutskiy , joern , Vitaly Wool , linux-kernel , "stanley.miao" , linux-mtd , Thomas Gleixner 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 Now that mtd block common layer is prepared for proper hotplug support, enable it here Now all users of the mtd device have a chance to put the mtd device when they are notified to do so, and they have to do so to make hotplug work. Signed-off-by: Maxim Levitsky --- drivers/mtd/mtdcore.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 3bdb7e8..0e86208 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -341,31 +341,32 @@ int add_mtd_device(struct mtd_info *mtd) int del_mtd_device (struct mtd_info *mtd) { int ret; + struct mtd_notifier *not; mutex_lock(&mtd_table_mutex); if (mtd_table[mtd->index] != mtd) { ret = -ENODEV; - } else if (mtd->usecount) { + goto out_error; + } + + /* No need to get a refcount on the module containing + the notifier, since we hold the mtd_table_mutex */ + list_for_each_entry(not, &mtd_notifiers, list) + not->remove(mtd); + + if (mtd->usecount) { printk(KERN_NOTICE "Removing MTD device #%d (%s) with use count %d\n", mtd->index, mtd->name, mtd->usecount); ret = -EBUSY; } else { - struct mtd_notifier *not; - device_unregister(&mtd->dev); - - /* No need to get a refcount on the module containing - the notifier, since we hold the mtd_table_mutex */ - list_for_each_entry(not, &mtd_notifiers, list) - not->remove(mtd); - mtd_table[mtd->index] = NULL; - module_put(THIS_MODULE); ret = 0; } +out_error: mutex_unlock(&mtd_table_mutex); return ret; }