Commit 4f5e3b6f authored by Richard Weinberger's avatar Richard Weinberger
Browse files

UBI: Fastmap: Care about the protection queue 



Fastmap can miss a PEB if it is in the protection queue
and not jet in the used tree.
Treat every protected PEB as used.

Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent fb4325a3

drivers/mtd/ubi/fastmap.c

+13 −0
Original line number Diff line number Diff line
@@ -1196,6 +1196,19 @@ static int ubi_write_fastmap(struct ubi_device *ubi, 
		fm_pos += sizeof(*fec);

		ubi_assert(fm_pos <= ubi->fm_size);

	}



	for (i = 0; i < UBI_PROT_QUEUE_LEN; i++) {

		list_for_each_entry(wl_e, &ubi->pq[i], u.list) {

			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);



			used_peb_count++;

			fm_pos += sizeof(*fec);

			ubi_assert(fm_pos <= ubi->fm_size);

		}

	}

	fmh->used_peb_count = cpu_to_be32(used_peb_count);



	for (node = rb_first(&ubi->scrub); node; node = rb_next(node)) {