From patchwork Thu Jun 21 21:50:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [09/15] UBI: Fastmap: Simplify attach by fastmap Date: Thu, 21 Jun 2012 11:50:02 -0000 From: Richard Weinberger X-Patchwork-Id: 166415 Message-Id: <1340315408-27375-10-git-send-email-richard@nod.at> To: linux-mtd@lists.infradead.org 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 No need to check for this corner cases anymore. Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/fastmap.c | 43 ------------------------------------------- 1 files changed, 0 insertions(+), 43 deletions(-) diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index ba69267..da303b6 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -707,49 +707,6 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, if (max_sqnum > ai->max_sqnum) ai->max_sqnum = max_sqnum; - list_for_each_entry_safe(tmp_aeb, _tmp_aeb, &used, u.list) { - list_del(&tmp_aeb->u.list); - ubi_msg("moving PEB from used to erase: %i", tmp_aeb->pnum); - add_aeb(ai, &ai->erase, tmp_aeb->pnum, tmp_aeb->ec, 0); - 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; - - list_for_each_entry(aeb, &ai->free, 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(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);