From patchwork Fri Jan 29 14:50:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 43923 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 4861FB7D09 for ; Sat, 30 Jan 2010 01:53:39 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NasCB-00019k-Qs; Fri, 29 Jan 2010 14:51:39 +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 1NasBz-00011c-AV for linux-mtd@lists.infradead.org; Fri, 29 Jan 2010 14:51:32 +0000 Received: by bwz4 with SMTP id 4so1893203bwz.2 for ; Fri, 29 Jan 2010 06:51:26 -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=uSdWnNuhsiSS2bh7BQL8Qx6K/B4lRv7edtmwoCOWCQ62fccmmPno8l8Yo9b98q8TdH BYcbAl0YsCk0PkMMEV7fCqxMrvozFq6Wf2A/WGxHpA8zdVyB7184gz0IFLVueYTIy7PB tmqURtxK1Et4Plz2DO0b87h8i1ApclpA8Wz04= 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=k5c4wdCS741pkk0tlnj6kjPv12zSey4QWQLRj7l5ay8pPSJ/R1tLNZSgqXhKsu8KWk Rzs2OjmW6OPpJ/EGNgEe8t2uVH1Ahm2sHgY3Hcq6r7kd0wZ0Ulo//PEYRBBImGYl/0Vw D9iwQm87odjOto+e1DYzhQCOGZFxh8IhXACek= Received: by 10.204.16.194 with SMTP id p2mr599584bka.32.1264776686550; Fri, 29 Jan 2010 06:51:26 -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.25 (version=SSLv3 cipher=RC4-MD5); Fri, 29 Jan 2010 06:51:25 -0800 (PST) From: Maxim Levitsky To: linux-mtd Subject: [PATCH 07/16] MTD: call remove notifiers before removing the device Date: Fri, 29 Jan 2010 16:50:54 +0200 Message-Id: <1264776663-7042-8-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_095127_485811_EF95F103 X-CRM114-Status: GOOD ( 15.69 ) 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 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; }