Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8930fa50 authored by Richard Weinberger's avatar Richard Weinberger Committed by Artem Bityutskiy
Browse files

UBI: Fix invalidate_fastmap() 



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: default avatarRichard Weinberger <richard@nod.at>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
parent 5ef4414f

drivers/mtd/ubi/fastmap.c

+1 −4
Original line number Diff line number Diff line
@@ -1343,7 +1343,7 @@ static int erase_block(struct ubi_device *ubi, int pnum) 
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;

}