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

Commit cbd8a9d2 authored by Jan Altenberg's avatar Jan Altenberg Committed by Artem Bityutskiy
Browse files

UBI: initialize static volumes with vol->used_bytes 



I came across a problem which seems to be present since:

commit 941dfb07
UBI: set correct gluebi device size

ubi_create_gluebi() leaves mtd->size = 0 for static volumes. So even
existing static volumes are initialized with a size of 0.

Signed-off-by: default avatarJan Altenberg <jan.altenberg@linutronix.de>
Signed-off-by: default avatarArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
parent 6e0c84e3

drivers/mtd/ubi/gluebi.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -291,11 +291,12 @@ int ubi_create_gluebi(struct ubi_device *ubi, struct ubi_volume *vol) 
	/*

	/*

	 * In case of dynamic volume, MTD device size is just volume size. In

	 * In case of dynamic volume, MTD device size is just volume size. In

	 * case of a static volume the size is equivalent to the amount of data

	 * case of a static volume the size is equivalent to the amount of data

	 * bytes, which is zero at this moment and will be changed after volume

	 * bytes.

	 * update.

	 */

	 */

	if (vol->vol_type == UBI_DYNAMIC_VOLUME)

	if (vol->vol_type == UBI_DYNAMIC_VOLUME)

		mtd->size = vol->usable_leb_size * vol->reserved_pebs;

		mtd->size = vol->usable_leb_size * vol->reserved_pebs;

	else

		mtd->size = vol->used_bytes;





	if (add_mtd_device(mtd)) {

	if (add_mtd_device(mtd)) {

		ubi_err("cannot not add MTD device\n");

		ubi_err("cannot not add MTD device\n");