diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2016-09-16 16:59:09 +0200 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2016-10-02 22:48:14 +0200 |
| commit | f5f9d43f0a61e636008e2325c1c6178bd5b0da27 (patch) | |
| tree | 32b3d107c46cd95de3a743dab0e709cb745c6e01 /drivers/mtd | |
| parent | 3be7988674ab33565700a37b210f502563d932e6 (diff) | |
| download | lwn-f5f9d43f0a61e636008e2325c1c6178bd5b0da27.tar.gz lwn-f5f9d43f0a61e636008e2325c1c6178bd5b0da27.zip | |
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>
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/ubi/fastmap.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c index 48eb55f344eb..a26dcc9d7703 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -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_ainf_peb *new_aeb) { - struct ubi_ainf_volume *av, *tmp_av = NULL; - struct rb_node **p = &ai->volumes.rb_node, *parent = NULL; - int found = 0; + struct ubi_ainf_volume *av; 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) { @@ -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 */ - while (*p) { - parent = *p; - 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 { + av = ubi_find_av(ai, be32_to_cpu(new_vh->vol_id)); + if (!av) { ubi_err(ubi, "orphaned volume in fastmap pool!"); kmem_cache_free(ai->aeb_slab_cache, new_aeb); return UBI_BAD_FASTMAP; |