summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Altenberg <jan.altenberg@linutronix.de>2008-03-28 16:13:53 +0100
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2008-04-17 11:32:02 +0300
commitcbd8a9d2cd6f576ca41022599341bbd8be1b0b27 (patch)
tree4b85d8497972adb46b574fc37bb73761c76d04ab
parent6e0c84e37e809e79313043385148020ceb760496 (diff)
downloadop-kernel-dev-cbd8a9d2cd6f576ca41022599341bbd8be1b0b27.zip
op-kernel-dev-cbd8a9d2cd6f576ca41022599341bbd8be1b0b27.tar.gz
UBI: initialize static volumes with vol->used_bytes
I came across a problem which seems to be present since: commit 941dfb07ed91451b1c58626a0d258dfdf468b593 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: Jan Altenberg <jan.altenberg@linutronix.de> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--drivers/mtd/ubi/gluebi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/gluebi.c b/drivers/mtd/ubi/gluebi.c
index d397219..e909b39 100644
--- a/drivers/mtd/ubi/gluebi.c
+++ b/drivers/mtd/ubi/gluebi.c
@@ -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
* 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
- * update.
+ * bytes.
*/
if (vol->vol_type == UBI_DYNAMIC_VOLUME)
mtd->size = vol->usable_leb_size * vol->reserved_pebs;
+ else
+ mtd->size = vol->used_bytes;
if (add_mtd_device(mtd)) {
ubi_err("cannot not add MTD device\n");
OpenPOWER on IntegriCloud