openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

UBI: Fastmap: Don't allocate new ubi_wl_entry objects 

There is no need to allocate new ones every time, we can reuse
the existing ones.
This makes the code cleaner and more easy to follow.

Signed-off-by: Richard Weinberger <richard@nod.at>
Reviewed-by: Tanya Brokhman <tlinder@codeaurora.org>
Reviewed-by: Guido Martínez <guido@vanguardiasur.com.ar>
This commit is contained in:
Richard Weinberger 2014-10-06 14:47:51 +02:00
parent 6830356466
commit c4ca6be9d6
2 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/mtd/ubi/fastmap.c
View File

@ -1446,19 +1446,6 @@ int ubi_update_fastmap(struct ubi_device *ubi)
} }
new_fm->used_blocks = ubi->fm_size / ubi->leb_size; new_fm->used_blocks = ubi->fm_size / ubi->leb_size;
for (i = 0; i < new_fm->used_blocks; i++) {
new_fm->e[i] = kmem_cache_alloc(ubi_wl_entry_slab, GFP_KERNEL);
if (!new_fm->e[i]) {
while (i--)
kfree(new_fm->e[i]);
kfree(new_fm);
mutex_unlock(&ubi->fm_mutex);
return -ENOMEM;
}
}
old_fm = ubi->fm; old_fm = ubi->fm;
ubi->fm = NULL; ubi->fm = NULL;
@ -1494,12 +1481,9 @@ int ubi_update_fastmap(struct ubi_device *ubi)
ubi_err(ubi, "could not erase old fastmap PEB"); ubi_err(ubi, "could not erase old fastmap PEB");
goto err; goto err;
} }
new_fm->e[i] = old_fm->e[i];
new_fm->e[i]->pnum = old_fm->e[i]->pnum;
new_fm->e[i]->ec = old_fm->e[i]->ec;
} else { } else {
new_fm->e[i]->pnum = tmp_e->pnum; new_fm->e[i] = tmp_e;
new_fm->e[i]->ec = tmp_e->ec;
if (old_fm) if (old_fm)
ubi_wl_put_fm_peb(ubi, old_fm->e[i], i, ubi_wl_put_fm_peb(ubi, old_fm->e[i], i,
@ -1524,16 +1508,13 @@ int ubi_update_fastmap(struct ubi_device *ubi)
i, 0); i, 0);
goto err; goto err;
} }
new_fm->e[0] = old_fm->e[0];
new_fm->e[0]->pnum = old_fm->e[0]->pnum;
new_fm->e[0]->ec = ret; new_fm->e[0]->ec = ret;
} else { } else {
/* we've got a new anchor PEB, return the old one */ /* we've got a new anchor PEB, return the old one */
ubi_wl_put_fm_peb(ubi, old_fm->e[0], 0, ubi_wl_put_fm_peb(ubi, old_fm->e[0], 0,
old_fm->to_be_tortured[0]); old_fm->to_be_tortured[0]);
new_fm->e[0] = tmp_e;
new_fm->e[0]->pnum = tmp_e->pnum;
new_fm->e[0]->ec = tmp_e->ec;
} }
} else { } else {
if (!tmp_e) { if (!tmp_e) {
@ -1546,9 +1527,7 @@ int ubi_update_fastmap(struct ubi_device *ubi)
ret = -ENOSPC; ret = -ENOSPC;
goto err; goto err;
} }
new_fm->e[0] = tmp_e;
new_fm->e[0]->pnum = tmp_e->pnum;
new_fm->e[0]->ec = tmp_e->ec;
} }
down_write(&ubi->work_sem); down_write(&ubi->work_sem);

3
drivers/mtd/ubi/wl.c
View File

@ -1011,9 +1011,6 @@ int ubi_wl_put_fm_peb(struct ubi_device *ubi, struct ubi_wl_entry *fm_e,
e = fm_e; e = fm_e;
ubi_assert(e->ec >= 0); ubi_assert(e->ec >= 0);
ubi->lookuptbl[pnum] = e; ubi->lookuptbl[pnum] = e;
} else {
e->ec = fm_e->ec;
kfree(fm_e);
} }
spin_unlock(&ubi->wl_lock); spin_unlock(&ubi->wl_lock);