[PATCH] [MTD] UBI: Fix counting of ec value

Timo Lindhorst
2007-02-12T09:26:20Z

If the torture is triggered on a peb, the block is erased more than
once. So the ec value should be increased accordingly.
ubi_io_sync_erase returns the number of erasures made, so this value
can be used instead of a static 1.

Signed-off-by: Timo Lindhorst <lindhors@linux.vnet.ibm.com>
---
drivers/mtd/ubi/wl.c | 27 +++++++++++++++------------
1 file changed, 15 insertions(+), 12 deletions(-)

--- ubi-2.6.git.orig/drivers/mtd/ubi/wl.c
+++ ubi-2.6.git/drivers/mtd/ubi/wl.c
@@ -1395,34 +1395,37 @@ bitflip:
static int sync_erase(const struct ubi_info *ubi, struct ubi_wl_entry *e,
int torture)
{
- int err;
+ int err, ret;
struct ubi_ec_hdr *ec_hdr;
struct ubi_wl_info *wl = ubi->wl;
- uint64_t ec = e->ec + 1;
+ uint64_t ec = e->ec;

- dbg_wl("erase PEB %d, new EC %lld", e->pnum, (long long)ec);
+ dbg_wl("erase PEB %d, old EC %lld", e->pnum, (long long)ec);

err = paranoid_check_ec(ubi, e->pnum, e->ec);
if (unlikely(err > 0))
return -EINVAL;

+ ec_hdr = ubi_zalloc_ec_hdr(ubi);
+ if (unlikely(!ec_hdr))
+ return -ENOMEM;
+
+ ret = err = ubi_io_sync_erase(ubi, e->pnum, torture);
+ if (unlikely(err < 0))
+ goto out_free;
+
+ ec += ret;
if (unlikely(ec > UBI_MAX_ERASECOUNTER)) {
/*
* Erase counter overflow. Upgrade UBI and use 64-bit
* erase counters internally.
*/
ubi_err("erase counter overflow at PEB %d, EC %d",
- e->pnum, e->ec);
+ e->pnum, ec);
return -EINVAL;
}

- ec_hdr = ubi_zalloc_ec_hdr(ubi);
- if (unlikely(!ec_hdr))
- return -ENOMEM;
-
- err = ubi_io_sync_erase(ubi, e->pnum, torture);
- if (unlikely(err < 0))
- goto out_free;
+ dbg_wl("erased PEB %d, new EC %lld", e->pnum, (long long)ec);

ec_hdr->ec = cpu_to_ubi64(ec);

@@ -1430,7 +1433,7 @@ static int sync_erase(const struct ubi_i
if (unlikely(err))
goto out_free;

- e->ec += 1;
+ e->ec = ec;
if (e->ec > wl->max_ec)
wl->max_ec = e->ec;