From: Bob Liu <lliubbo@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: keir@xen.org, ian.campbell@citrix.com, andrew.cooper3@citrix.com,
JBeulich@suse.com
Subject: [PATCH 06/14] tmem: cleanup: remove unneed parameter from pgp_free()
Date: Tue, 28 Jan 2014 12:28:25 +0800 [thread overview]
Message-ID: <1390883313-19313-7-git-send-email-bob.liu@oracle.com> (raw)
In-Reply-To: <1390883313-19313-1-git-send-email-bob.liu@oracle.com>
The only difference of the "from_delete" parameter in pgp_free() is one line
ASSERT(), this patch remove it to make code more clean.
Signed-off-by: Bob Liu <bob.liu@oracle.com>
---
xen/common/tmem.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/xen/common/tmem.c b/xen/common/tmem.c
index 8a6ee84..9cfbca3 100644
--- a/xen/common/tmem.c
+++ b/xen/common/tmem.c
@@ -654,15 +654,14 @@ static void pgp_free_data(struct tmem_page_descriptor *pgp, struct tmem_pool *po
pgp->size = -1;
}
-static void pgp_free(struct tmem_page_descriptor *pgp, int from_delete)
+static void pgp_free(struct tmem_page_descriptor *pgp)
{
struct tmem_pool *pool = NULL;
ASSERT(pgp->us.obj != NULL);
- ASSERT(pgp->us.obj->pool->client != NULL);
- if ( from_delete )
- ASSERT(pgp_lookup_in_obj(pgp->us.obj,pgp->index) == NULL);
ASSERT(pgp->us.obj->pool != NULL);
+ ASSERT(pgp->us.obj->pool->client != NULL);
+
pool = pgp->us.obj->pool;
if ( !is_persistent(pool) )
{
@@ -743,7 +742,8 @@ static void pgp_delete(struct tmem_page_descriptor *pgp)
life = get_cycles() - pgp->timestamp;
pgp->us.obj->pool->sum_life_cycles += life;
pgp_delist(pgp);
- pgp_free(pgp,1);
+ ASSERT(pgp_lookup_in_obj(pgp->us.obj,pgp->index) == NULL);
+ pgp_free(pgp);
}
/* called only indirectly by radix_tree_destroy */
@@ -756,7 +756,7 @@ static void pgp_destroy(void *v)
ASSERT(pgp->us.obj != NULL);
pgp->us.obj->pgp_count--;
ASSERT(pgp->us.obj->pgp_count >= 0);
- pgp_free(pgp,0);
+ pgp_free(pgp);
}
static int pgp_add_to_obj(struct tmem_object_root *obj, uint32_t index, struct tmem_page_descriptor *pgp)
@@ -1350,7 +1350,7 @@ found:
}
/* pgp already delist, so call pgp_free directly */
- pgp_free(pgp, 1);
+ pgp_free(pgp);
if ( obj->pgp_count == 0 )
{
ASSERT_WRITELOCK(&pool->pool_rwlock);
--
1.7.10.4
next prev parent reply other threads:[~2014-01-28 4:30 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-28 4:28 [PATCH RESEND 00/14] xen: new patches for tmem Bob Liu
2014-01-28 4:28 ` [PATCH 01/14] tmem: remove pageshift from struct tmem_pool Bob Liu
2014-01-28 4:28 ` [PATCH 02/14] tmem: refactor function do_tmem_op() Bob Liu
2014-01-28 4:28 ` [PATCH 03/14] tmem: cleanup: drop unneeded client/pool initialization Bob Liu
2014-01-28 4:28 ` [PATCH 04/14] tmem: bugfix in obj allocate path Bob Liu
2014-01-28 4:28 ` [PATCH 05/14] tmem: cleanup: remove unneed parameter from pgp_delist() Bob Liu
2014-01-28 4:28 ` Bob Liu [this message]
2014-01-28 4:28 ` [PATCH 07/14] tmem: cleanup the pgp free path Bob Liu
2014-01-28 4:28 ` [PATCH 08/14] tmem: drop oneline function client_freeze() Bob Liu
2014-01-28 4:28 ` [PATCH 09/14] tmem: remove unneeded parameters from obj destroy path Bob Liu
2014-01-28 4:28 ` [PATCH 10/14] tmem: cleanup: drop global_pool_list Bob Liu
2014-01-28 4:28 ` [PATCH 11/14] tmem: fix the return value of tmemc_set_var() Bob Liu
2014-01-28 4:28 ` [PATCH 12/14] tmem: cleanup: refactor function tmemc_shared_pool_auth() Bob Liu
2014-01-28 4:28 ` [PATCH 13/14] tmem: reorg the shared pool allocate path Bob Liu
2014-03-05 22:03 ` Konrad Rzeszutek Wilk
2014-01-28 4:28 ` [PATCH 14/14] tmem: remove useless parameter from client and pool flush Bob Liu
2014-03-19 17:04 ` [PATCH RESEND 00/14] xen: new patches for tmem Konrad Rzeszutek Wilk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1390883313-19313-7-git-send-email-bob.liu@oracle.com \
--to=lliubbo@gmail.com \
--cc=JBeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=keir@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).