From patchwork Mon Feb 22 18:39:32 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 45984 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 3652EB7C59 for ; Tue, 23 Feb 2010 05:42:05 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NjdCZ-0004jx-V6; Mon, 22 Feb 2010 18:40:16 +0000 Received: from mail-fx0-f214.google.com ([209.85.220.214]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NjdCP-000450-IN for linux-mtd@lists.infradead.org; Mon, 22 Feb 2010 18:40:13 +0000 Received: by mail-fx0-f214.google.com with SMTP id 6so5097024fxm.2 for ; Mon, 22 Feb 2010 10:40:05 -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=1Ud1Hwn99N/HdhFDTGbbcV7HPEk7ZXCxu11YklWdWpU=; b=nBuSwkFoDGkFNlv37AlJtspqsgyO8T/6bwjywgO7bDHmnVBJ4zEFbtYSASCC4Xs2nP pCMVyPYhm5SQ3z9Yr75e+7DIPpBAycBDXXgRCAD2PwfcI/46y9sbhPOJgismY1Fu+3pN 75WQ8oSAQsLqm1UaXdQm3eurSejOJElYXDsB4= 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=KUld8fTNrMDZHJ+JkrnCDMFQz/SWgWcBA0U83LxE8qYe/s4o5SK4XHdnFeP+tqBcCU upLgFLi1yWe5PBxtp0ZUY7wdOUgBVUaIOfBTQkOFhZiEigUfP9WsEXwHsVdIXM+RZFwE Q9W49qnLNQvErk9U4+PNxp5OCckTFVAdbBQfE= Received: by 10.87.76.6 with SMTP id d6mr10566819fgl.71.1266864005050; Mon, 22 Feb 2010 10:40:05 -0800 (PST) Received: from localhost.localdomain ([77.124.235.8]) by mx.google.com with ESMTPS id 14sm1712094fxm.9.2010.02.22.10.40.02 (version=SSLv3 cipher=RC4-MD5); Mon, 22 Feb 2010 10:40:04 -0800 (PST) From: Maxim Levitsky To: David Woodhouse Subject: [PATCH 05/15] MTD: call the remove notifiers before assuming it is in use Date: Mon, 22 Feb 2010 20:39:32 +0200 Message-Id: <1266863982-5258-6-git-send-email-maximlevitsky@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1266863982-5258-1-git-send-email-maximlevitsky@gmail.com> References: <1266863982-5258-1-git-send-email-maximlevitsky@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100222_134006_035817_0E93DE8A X-CRM114-Status: GOOD ( 15.65 ) 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 , Vitaly Wool , joern , linux-kernel , stanley.miao@windriver.com, 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 | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 67669a7..70a7858 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -350,31 +350,34 @@ fail_locked: int del_mtd_device (struct mtd_info *mtd) { int ret; + struct mtd_notifier *not; mutex_lock(&mtd_table_mutex); if (idr_find(&mtd_idr, 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); - idr_remove(&mtd_idr, mtd->index); module_put(THIS_MODULE); ret = 0; } +out_error: mutex_unlock(&mtd_table_mutex); return ret; }