lmb: Fix lmb_add_region_flags() return codes and testing
The function description says this should return 0 or -1 on failures.
When regions coalesce though this returns the number of coalescedregions
which is confusing and requires special handling of the return code.
On top of that no one is using the number of coalesced regions.
So let's just return 0 on success and adjust our selftests accordingly
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Reviewed-by: Caleb Connolly <caleb.connolly@linaro.org>
diff --git a/lib/lmb.c b/lib/lmb.c
index bf261db..24d1ebe 100644
--- a/lib/lmb.c
+++ b/lib/lmb.c
@@ -451,7 +451,7 @@
}
if (coalesced)
- return coalesced;
+ return 0;
if (alist_full(lmb_rgn_lst) &&
!alist_expand_by(lmb_rgn_lst, lmb_rgn_lst->alloc))
@@ -488,7 +488,7 @@
struct alist *lmb_rgn_lst = &lmb.free_mem;
ret = lmb_add_region(lmb_rgn_lst, base, size);
- if (ret < 0)
+ if (ret)
return ret;
if (lmb_should_notify(LMB_NONE))
@@ -584,8 +584,8 @@
struct alist *lmb_rgn_lst = &lmb.used_mem;
ret = lmb_add_region_flags(lmb_rgn_lst, base, size, flags);
- if (ret < 0)
- return -1;
+ if (ret)
+ return ret;
if (lmb_should_notify(flags))
return lmb_map_update_notify(base, size, MAP_OP_RESERVE);
@@ -652,7 +652,7 @@
if (rgn < 0) {
/* This area isn't reserved, take it */
if (lmb_add_region_flags(&lmb.used_mem, base,
- size, flags) < 0)
+ size, flags))
return 0;
if (lmb_should_notify(flags)) {