diff options
| author | Boris Brezillon <boris.brezillon@free-electrons.com> | 2018-08-29 14:19:34 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-08-31 08:23:29 +0200 |
| commit | e8e9f6ca347699f48c84f3dfea6353cee8940e29 (patch) | |
| tree | 7f7e4ed3694bba0f95f13b72c4714523d7aea75d /drivers/mtd/ubi | |
| parent | 2f71050569310fe567913edf50b31ee4cd007b86 (diff) | |
| download | barebox-e8e9f6ca347699f48c84f3dfea6353cee8940e29.tar.gz barebox-e8e9f6ca347699f48c84f3dfea6353cee8940e29.tar.xz | |
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>
Signed-off-by: Teresa Remmet <t.remmet@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mtd/ubi')
| -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 d60f89fdb3..37bb93bc2a 100644 --- a/drivers/mtd/ubi/fastmap.c +++ b/drivers/mtd/ubi/fastmap.c @@ -303,9 +303,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) { @@ -315,23 +313,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!"); kfree(new_aeb); return UBI_BAD_FASTMAP; |