From patchwork Mon Jun 18 16:18:56 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 165512 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 B3DFAB6FD4 for ; Tue, 19 Jun 2012 02:22:05 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1Sgeh7-000112-Ca; Mon, 18 Jun 2012 16:20:49 +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 1Sgefy-0000fM-DL for linux-mtd@lists.infradead.org; Mon, 18 Jun 2012 16:19:41 +0000 Received: (qmail 14394 invoked by uid 89); 18 Jun 2012 16:19:36 -0000 Received: by simscan 1.3.1 ppid: 14119, pid: 14391, t: 0.1249s 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:36 -0000 From: Richard Weinberger To: linux-mtd@lists.infradead.org Subject: [PATCH 13/22] UBI: Fastmap: Fix EC values Date: Mon, 18 Jun 2012 18:18:56 +0200 Message-Id: <1340036345-96726-14-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 Return the correct EC values back to the WL sub-system. Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/fastmap.c | 2 ++ drivers/mtd/ubi/wl.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 33a14cf..b4f7fce 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -721,6 +721,7 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, 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; @@ -1345,6 +1346,7 @@ int ubi_update_fastmap(struct ubi_device *ubi) ec = be64_to_cpu(ec_hdr->ec); ec += ret; + old_fm->e[0]->ec = ec; if (ec > UBI_MAX_ERASECOUNTER) { ubi_err("erase counter overflow!"); kfree(ec_hdr); diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index 25d2e0b..eec3940 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -839,8 +839,10 @@ int ubi_wl_put_fm_peb(struct ubi_device *ubi, struct ubi_wl_entry *fm_e, e = fm_e; ubi_assert(e->ec); ubi->lookuptbl[pnum] = e; - } else + } else { + e->ec = fm_e->ec; kfree(fm_e); + } spin_unlock(&ubi->wl_lock);