UBI: cleanup LEB start calculations
authorJohn Ogness <john.ogness@linutronix.de>
Fri, 21 Jan 2011 14:39:02 +0000 (15:39 +0100)
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>
Wed, 26 Jan 2011 08:14:17 +0000 (10:14 +0200)
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>
drivers/mtd/ubi/build.c

index 5ebe280225d60a69f28bc81c5c4593a47e017365..ef296350aa8f5c61dafa3ae164498bfb74095690 100644 (file)
@@ -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);