From 3b7543064d2a6087e4c00e619b4a40545d5db5d3 Mon Sep 17 00:00:00 2001 From: Mathieu Maret Date: Tue, 26 Jan 2021 08:45:13 +0100 Subject: [PATCH] alloc: simplify full usage --- core/alloc.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/core/alloc.c b/core/alloc.c index 75f2ad5..bfa5517 100644 --- a/core/alloc.c +++ b/core/alloc.c @@ -217,9 +217,8 @@ static void *allocFromSlab(struct slabEntry *slab) if (*next == (vaddr_t)NULL) { pr_devel("Slab @%d is now full\n", slab); slab->full = 1; - } else { - slab->freeEl = (void *)(*next); } + slab->freeEl = (void *)(*next); return (void *)next; } @@ -289,12 +288,7 @@ static int freeFromSlab(void *ptr, struct slabEntry *slab) if ((slabEntry->page <= (vaddr_t)ptr) && ((vaddr_t)ptr < (slabEntry->page + slabEntry->size))) { - if (slabEntry->full) { - *((vaddr_t *)ptr) = (vaddr_t)NULL; - } else { - *((vaddr_t *)ptr) = (vaddr_t)slabEntry->freeEl; - } - + *((vaddr_t *)ptr) = (vaddr_t)slabEntry->freeEl; slabEntry->freeEl = ptr; slabEntry->full = 0; return 1;