diff options
| author |   Richard Weinberger <richard@nod.at> | 2014-10-29 16:59:32 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2015-03-26 22:46:02 +0100 |
| commit | 61de74ce2fa2cc9eee85cf5edc6525b12831b507 (patch) | |
| tree | 3a8f6e4288574907c183a3992b4ffb06093633f7 /drivers/mtd/ubi/fastmap.c | |
| parent | UBI: Fastmap: Locking updates (diff) | |
| download | linux-dev-61de74ce2fa2cc9eee85cf5edc6525b12831b507.tar.xz linux-dev-61de74ce2fa2cc9eee85cf5edc6525b12831b507.zip | |
UBI: Fastmap: Prepare for variable sized fastmaps
The current code assumes that each fastmap has the same amount of PEBs.
So far this is true but will change soon.
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'drivers/mtd/ubi/fastmap.c')
| -rw-r--r-- | drivers/mtd/ubi/fastmap.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 2cf2506b8f44..762e25c6a2d2 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -1385,7 +1385,7 @@ int ubi_update_fastmap(struct ubi_device *ubi) ret = -ENOSPC; goto err; - } else if (!tmp_e && old_fm) { + } else if (!tmp_e && old_fm && old_fm->e[i]) { ret = erase_block(ubi, old_fm->e[i]->pnum); if (ret < 0) { int j; @@ -1401,12 +1401,20 @@ int ubi_update_fastmap(struct ubi_device *ubi) } else { new_fm->e[i] = tmp_e; - if (old_fm) + if (old_fm && old_fm->e[i]) ubi_wl_put_fm_peb(ubi, old_fm->e[i], i, old_fm->to_be_tortured[i]); } } + /* Old fastmap is larger than the new one */ + if (old_fm && new_fm->used_blocks < old_fm->used_blocks) { + for (i = new_fm->used_blocks; i < old_fm->used_blocks; i++) { + ubi_wl_put_fm_peb(ubi, old_fm->e[i], i, + old_fm->to_be_tortured[i]); + } + } + spin_lock(&ubi->wl_lock); tmp_e = ubi_wl_get_fm_peb(ubi, 1); spin_unlock(&ubi->wl_lock); |