From 480505b640861aa5a44887c99f4d07fa21da6f3c Mon Sep 17 00:00:00 2001 From: Stathis Kamperis Date: Thu, 5 Jun 2008 12:09:40 +0300 Subject: [PATCH] Simplify buddy retrieval in mpool_free() --- buddy/mpool.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buddy/mpool.c b/buddy/mpool.c index 051f42c..fc3ea99 100644 --- a/buddy/mpool.c +++ b/buddy/mpool.c @@ -261,8 +261,6 @@ void mpool_free(mpool_t *mpool, void *ptr) DPRINTF(("buddy out of pool\n")); return; } - if (pbuddy->logsize != pnode->logsize) - pbuddy = NULL; } /* `pnode' is a left buddy, so `pbuddy' is a right buddy */ else { @@ -271,10 +269,12 @@ void mpool_free(mpool_t *mpool, void *ptr) DPRINTF(("buddy out of pool\n")); return; } - if (pbuddy->logsize != pnode->logsize) - pbuddy = NULL; } + /* Buddies must be of the same size */ + if (pbuddy->logsize != pnode->logsize) + pbuddy = NULL; + /* * If there is no buddy of `pnode' or if there is, but it's unavailable, * just free `pnode' and we are done. -- 2.11.4.GIT