From patchwork Mon Jun 18 16:19:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 165521 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 04000B7063 for ; Tue, 19 Jun 2012 02:23:36 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SgeiY-00026v-Dh; Mon, 18 Jun 2012 16:22:19 +0000 Received: from a.ns.miles-group.at ([95.130.255.143] helo=radon.swed.at) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1Sgeg5-0000hF-GS for linux-mtd@lists.infradead.org; Mon, 18 Jun 2012 16:19:47 +0000 Received: (qmail 14546 invoked by uid 89); 18 Jun 2012 16:19:43 -0000 Received: by simscan 1.3.1 ppid: 14119, pid: 14543, t: 0.1260s scanners: attach: 1.3.1 clamav: 0.96.5/m:53 Received: from unknown (HELO localhost.localdomain) (richard@nod.at@212.62.202.73) by radon.swed.at with ESMTPA; 18 Jun 2012 16:19:43 -0000 From: Richard Weinberger To: linux-mtd@lists.infradead.org Subject: [PATCH 21/22] UBI: Fastmap: Fix and explain duplicated PEBs Date: Mon, 18 Jun 2012 18:19:04 +0200 Message-Id: <1340036345-96726-22-git-send-email-richard@nod.at> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1340036345-96726-1-git-send-email-richard@nod.at> References: <1340036345-96726-1-git-send-email-richard@nod.at> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: artem.bityutskiy@linux.intel.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, Heinz.Egger@linutronix.de, thomas.wucher@linutronix.de, shmulik.ladkani@gmail.com, Richard Weinberger , tglx@linutronix.de, Marius.Mazarel@ugal.ro, tim.bird@am.sony.com X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 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 Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/fastmap.c | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index bea9446..45f70db 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -714,6 +714,15 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, kmem_cache_free(ai->aeb_slab_cache, tmp_aeb); } + /* + * Sort out dups. We are allowed to have duplicates here because + * the fastmap can be written without refilling all pools. + * E.g. If PEB X is in a pool fastmap may detect it as empty and + * puts it into the free list. But ff PEB X is in the pool, get's + * used and returned (e.g. by schedule_erase()) it remains in + * the erase or free list too. + * We could also sort out these dups while creating the fastmap. + */ if (list_empty(&free)) goto out; @@ -729,6 +738,18 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, } } + list_for_each_entry(aeb, &ai->erase, u.list) { + list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &free, u.list) { + if (aeb->pnum == tmp_aeb->pnum) { + aeb->scrub = tmp_aeb->scrub; + aeb->ec = tmp_aeb->ec; + list_del(&tmp_aeb->u.list); + kfree(tmp_aeb); + continue; + } + } + } + list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &free, u.list) { list_del(&tmp_aeb->u.list); list_add_tail(&tmp_aeb->u.list, &ai->free);