From patchwork Mon Jun 18 16:18:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Weinberger X-Patchwork-Id: 165504 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 04801B706D for ; Tue, 19 Jun 2012 02:21:35 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SgegF-0000il-Gn; Mon, 18 Jun 2012 16:19:55 +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 1Sgefo-0000cl-NZ for linux-mtd@lists.infradead.org; Mon, 18 Jun 2012 16:19:30 +0000 Received: (qmail 14208 invoked by uid 89); 18 Jun 2012 16:19:24 -0000 Received: by simscan 1.3.1 ppid: 14119, pid: 14202, t: 0.1270s 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:24 -0000 From: Richard Weinberger To: linux-mtd@lists.infradead.org Subject: [PATCH 04/22] UBI: Fastmap: Store scrub list in fastmap Date: Mon, 18 Jun 2012 18:18:47 +0200 Message-Id: <1340036345-96726-5-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 If scrub work is pending while writing the fastmap we have to store it into the fastmap otherwise we'd leak PEBs. Signed-off-by: Richard Weinberger --- drivers/mtd/ubi/fastmap.c | 26 ++++++++++++++++++++++++++ drivers/mtd/ubi/ubi-media.h | 3 ++- 2 files changed, 28 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 9ed4723..bc29835 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -560,6 +560,17 @@ static int ubi_attach_fastmap(struct ubi_device *ubi, be32_to_cpu(fmec->ec), 0); } + /* read EC values from scrub list */ + for (i = 0; i < be32_to_cpu(fmhdr->scrub_peb_count); i++) { + fmec = (struct ubi_fm_ec *)(fm_raw + fm_pos); + fm_pos += sizeof(*fmec); + if (fm_pos >= fm_size) + goto fail_bad; + + add_aeb(ai, &used, be32_to_cpu(fmec->pnum), + be32_to_cpu(fmec->ec), 1); + } + ai->mean_ec = div_u64(ai->ec_sum, ai->ec_count); ai->bad_peb_count = be32_to_cpu(fmhdr->bad_peb_count); @@ -1016,6 +1027,7 @@ static int ubi_write_fastmap(struct ubi_device *ubi, struct ubi_volume *vol; struct ubi_vid_hdr *avhdr, *dvhdr; int ret, i, j, free_peb_count, used_peb_count, vol_count; + int scrub_peb_count; fm_raw = vzalloc(new_fm->size); if (!fm_raw) { @@ -1055,6 +1067,7 @@ static int ubi_write_fastmap(struct ubi_device *ubi, fmh->magic = cpu_to_be32(UBI_FM_HDR_MAGIC); free_peb_count = 0; used_peb_count = 0; + scrub_peb_count = 0; vol_count = 0; fmpl1 = (struct ubi_fm_scan_pool *)(fm_raw + fm_pos); @@ -1099,6 +1112,19 @@ static int ubi_write_fastmap(struct ubi_device *ubi, } fmh->used_peb_count = cpu_to_be32(used_peb_count); + for (node = rb_first(&ubi->scrub); node; node = rb_next(node)) { + wl_e = rb_entry(node, struct ubi_wl_entry, u.rb); + fec = (struct ubi_fm_ec *)(fm_raw + fm_pos); + + fec->pnum = cpu_to_be32(wl_e->pnum); + fec->ec = cpu_to_be32(wl_e->ec); + + scrub_peb_count++; + fm_pos += sizeof(*fec); + ubi_assert(fm_pos <= new_fm->size); + } + fmh->scrub_peb_count = cpu_to_be32(scrub_peb_count); + for (i = 0; i < UBI_MAX_VOLUMES + UBI_INT_VOL_COUNT; i++) { vol = ubi->volumes[i]; diff --git a/drivers/mtd/ubi/ubi-media.h b/drivers/mtd/ubi/ubi-media.h index a36748c..bea8c95 100644 --- a/drivers/mtd/ubi/ubi-media.h +++ b/drivers/mtd/ubi/ubi-media.h @@ -440,9 +440,10 @@ struct ubi_fm_hdr { __be32 magic; __be32 free_peb_count; __be32 used_peb_count; + __be32 scrub_peb_count; __be32 vol_count; __be32 bad_peb_count; - __u8 padding[12]; + __u8 padding[8]; } __packed; /* struct ubi_fm_hdr is followed by struct ubi_fm_scan_pool */