]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
UBI: Fix invalidate_fastmap()
authorRichard Weinberger <richard@nod.at>
Mon, 19 Aug 2013 20:31:49 +0000 (22:31 +0200)
committerArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Tue, 20 Aug 2013 14:53:25 +0000 (17:53 +0300)
Onging tests uncovered that invalidate_fastmap() is broken.
It must not call ubi_wl_put_fm_peb() because all PEBs used
by the old fastmap have already been put back.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
drivers/mtd/ubi/fastmap.c

index 154275182b4b22d8943e4be1ba6d5eb119694e3a..f5aa4b02cfa676f3270dc9b9a87bd87ef031893d 100644 (file)
@@ -1343,7 +1343,7 @@ out:
 static int invalidate_fastmap(struct ubi_device *ubi,
                              struct ubi_fastmap_layout *fm)
 {
-       int ret, i;
+       int ret;
        struct ubi_vid_hdr *vh;
 
        ret = erase_block(ubi, fm->e[0]->pnum);
@@ -1360,9 +1360,6 @@ static int invalidate_fastmap(struct ubi_device *ubi,
        vh->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));
        ret = ubi_io_write_vid_hdr(ubi, fm->e[0]->pnum, vh);
 
-       for (i = 0; i < fm->used_blocks; i++)
-               ubi_wl_put_fm_peb(ubi, fm->e[i], i, fm->to_be_tortured[i]);
-
        return ret;
 }