hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

UBI: fastmap: use ubi_find_volume() instead of open coding it 

process_pool_aeb() re-implements the logic found in ubi_find_volume().
Call ubi_find_volume() to avoid this duplication.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Boris Brezillon 2016-09-16 16:59:09 +02:00 committed by Richard Weinberger
parent 3be7988674
commit f5f9d43f0a
1 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,9 +370,7 @@ static int process_pool_aeb(struct ubi_device *ubi, struct ubi_attach_info *ai,
struct ubi_vid_hdr *new_vh, struct ubi_vid_hdr *new_vh,
struct ubi_ainf_peb *new_aeb) struct ubi_ainf_peb *new_aeb)
{ {
struct ubi_ainf_volume *av, *tmp_av = NULL; struct ubi_ainf_volume *av;
struct rb_node **p = &ai->volumes.rb_node, *parent = NULL;
int found = 0;
if (be32_to_cpu(new_vh->vol_id) == UBI_FM_SB_VOLUME_ID || if (be32_to_cpu(new_vh->vol_id) == UBI_FM_SB_VOLUME_ID ||
be32_to_cpu(new_vh->vol_id) == UBI_FM_DATA_VOLUME_ID) { be32_to_cpu(new_vh->vol_id) == UBI_FM_DATA_VOLUME_ID) {
@ -382,23 +380,8 @@ static int process_pool_aeb(struct ubi_device *ubi, struct ubi_attach_info *ai,
} }
/* Find the volume this SEB belongs to */ /* Find the volume this SEB belongs to */
while (*p) { av = ubi_find_av(ai, be32_to_cpu(new_vh->vol_id));
parent = *p; if (!av) {
tmp_av = rb_entry(parent, struct ubi_ainf_volume, rb);
if (be32_to_cpu(new_vh->vol_id) > tmp_av->vol_id)
p = &(*p)->rb_left;
else if (be32_to_cpu(new_vh->vol_id) < tmp_av->vol_id)
p = &(*p)->rb_right;
else {
found = 1;
break;
}
}
if (found)
av = tmp_av;
else {
ubi_err(ubi, "orphaned volume in fastmap pool!"); ubi_err(ubi, "orphaned volume in fastmap pool!");
kmem_cache_free(ai->aeb_slab_cache, new_aeb); kmem_cache_free(ai->aeb_slab_cache, new_aeb);
return UBI_BAD_FASTMAP; return UBI_BAD_FASTMAP;