Commit e8cfe009 authored Jan 21, 2011 by John Ogness Committed by Artem Bityutskiy Jan 26, 2011

UBI: cleanup LEB start calculations



Wrong macro was used in calculating the data offset: UBI_EC_HDR_SIZE instead of
UBI_VID_HDR_SIZE. The data offset should be VID header offset + VID header size
(aligned to the minimum I/O unit).

This was not a bug only because currently UBI_EC_HDR_SIZE and UBI_VID_HDR_SIZE
have the same value of 64 bytes.

Commit message was amended by Artem.

Signed-off-by: John Ogness <john.ogness@linutronix.de>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

parent d4c63813

drivers/mtd/ubi/build.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -711,7 +711,7 @@ static int io_init(struct ubi_device *ubi)
		}

		/* Similar for the data offset */
		ubi->leb_start = ubi->vid_hdr_offset + UBI_EC_HDR_SIZE;
		ubi->leb_start = ubi->vid_hdr_offset + UBI_VID_HDR_SIZE;
		ubi->leb_start = ALIGN(ubi->leb_start, ubi->min_io_size);

		dbg_msg("vid_hdr_offset %d", ubi->vid_hdr_offset);

Admin message