From patchwork Mon Jun 18 16:19:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 165518 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 E9990B705E for ; Tue, 19 Jun 2012 02:23: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 1Sgehz-0001gq-Dk; Mon, 18 Jun 2012 16:21:43 +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 1Sgeg2-0000gJ-Ia for linux-mtd@lists.infradead.org; Mon, 18 Jun 2012 16:19:45 +0000 Received: (qmail 14489 invoked by uid 89); 18 Jun 2012 16:19:41 -0000 Received: by simscan 1.3.1 ppid: 14119, pid: 14486, t: 0.1345s 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:41 -0000 From: Richard Weinberger To: linux-mtd@lists.infradead.org Subject: [PATCH 18/22] UBI: Fastmap: Rename "early PEB" to "anchor PEB". Date: Mon, 18 Jun 2012 18:19:01 +0200 Message-Id: <1340036345-96726-19-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 "early PEB" is a very bad name. Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/fastmap.c | 8 ++++---- drivers/mtd/ubi/wl.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 65fd7ee..bea9446 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -1404,18 +1404,18 @@ int ubi_update_fastmap(struct ubi_device *ubi) spin_unlock(&ubi->wl_lock); if (old_fm) { - /* no fresh early PEB was found, reuse the old one */ + /* no fresh anchor PEB was found, reuse the old one */ if (!tmp_e) { ret = erase_block(ubi, old_fm->e[0]->pnum); if (ret < 0) { - ubi_err("could not erase old early PEB"); + ubi_err("could not erase old anchor PEB"); goto err; } new_fm->e[0]->pnum = old_fm->e[0]->pnum; new_fm->e[0]->ec = ret; } else { - /* we've got a new early PEB, return the old one */ + /* we've got a new anchor PEB, return the old one */ ubi_wl_put_fm_peb(ubi, old_fm->e[0], old_fm->to_be_tortured[0]); @@ -1429,7 +1429,7 @@ int ubi_update_fastmap(struct ubi_device *ubi) old_fm->to_be_tortured[i]); } else { if (!tmp_e) { - ubi_err("could not find an early PEB"); + ubi_err("could not find an anchor PEB"); ret = -ENOSPC; goto err; } diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index be847d4..e5ab683 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c @@ -388,12 +388,12 @@ static struct ubi_wl_entry *find_mean_wl_entry(struct rb_root *root) } /** - * find_early_wl_entry - find wear-leveling entry with the lowest pnum. + * find_anchor_wl_entry - find wear-leveling entry to used as anchor PEB. * @root: the RB-tree where to look for * @max_pnum: highest possible pnum */ -static struct ubi_wl_entry *find_early_wl_entry(struct rb_root *root, - int max_pnum) +static struct ubi_wl_entry *find_anchor_wl_entry(struct rb_root *root, + int max_pnum) { struct rb_node *p; struct ubi_wl_entry *e, *victim = NULL; @@ -433,7 +433,7 @@ struct ubi_wl_entry *ubi_wl_get_fm_peb(struct ubi_device *ubi, int max_pnum) if (max_pnum < 0) e = find_mean_wl_entry(&ubi->free); else - e = find_early_wl_entry(&ubi->free, max_pnum); + e = find_anchor_wl_entry(&ubi->free, max_pnum); if (!e) goto out;