From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Liu Subject: [PATCH 09/14] tmem: remove unneeded parameters for obj destroy Date: Wed, 18 Dec 2013 14:52:36 +0800 Message-ID: <1387349561-27923-10-git-send-email-bob.liu@oracle.com> References: <1387349561-27923-1-git-send-email-bob.liu@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VtB37-0006zt-Hi for xen-devel@lists.xenproject.org; Wed, 18 Dec 2013 06:56:05 +0000 Received: by mail-pd0-f172.google.com with SMTP id g10so7794392pdj.17 for ; Tue, 17 Dec 2013 22:56:02 -0800 (PST) In-Reply-To: <1387349561-27923-1-git-send-email-bob.liu@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: james.harper@bendigoit.com.au, keir@xen.org, ian.campbell@citrix.com, andrew.cooper3@citrix.com, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org Parameters selective and no_rebalance are unneeded during obj destory, this patch remove them. Signed-off-by: Bob Liu --- xen/common/tmem.c | 35 +++++++++++++++-------------------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 70c80ab..0febae1 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -885,7 +885,7 @@ restart_find: } /* free an object that has no more pgps in it */ -static void obj_free(struct tmem_object_root *obj, int no_rebalance) +static void obj_free(struct tmem_object_root *obj) { struct tmem_pool *pool; struct oid old_oid; @@ -908,9 +908,7 @@ static void obj_free(struct tmem_object_root *obj, int no_rebalance) oid_set_invalid(&obj->oid); obj->last_client = TMEM_CLI_ID_NULL; atomic_dec_and_assert(global_obj_count); - /* use no_rebalance only if all objects are being destroyed anyway */ - if ( !no_rebalance ) - rb_erase(&obj->rb_tree_node,&pool->obj_rb_root[oid_hash(&old_oid)]); + rb_erase(&obj->rb_tree_node, &pool->obj_rb_root[oid_hash(&old_oid)]); spin_unlock(&obj->obj_spinlock); tmem_free(obj, pool); } @@ -969,15 +967,15 @@ static struct tmem_object_root * obj_alloc(struct tmem_pool *pool, struct oid *o } /* free an object after destroying any pgps in it */ -static void obj_destroy(struct tmem_object_root *obj, int no_rebalance) +static void obj_destroy(struct tmem_object_root *obj) { ASSERT_WRITELOCK(&obj->pool->pool_rwlock); radix_tree_destroy(&obj->tree_root, pgp_destroy); - obj_free(obj,no_rebalance); + obj_free(obj); } /* destroys all objs in a pool, or only if obj->last_client matches cli_id */ -static void pool_destroy_objs(struct tmem_pool *pool, bool_t selective, domid_t cli_id) +static void pool_destroy_objs(struct tmem_pool *pool, domid_t cli_id) { struct rb_node *node; struct tmem_object_root *obj; @@ -993,11 +991,8 @@ static void pool_destroy_objs(struct tmem_pool *pool, bool_t selective, domid_t obj = container_of(node, struct tmem_object_root, rb_tree_node); spin_lock(&obj->obj_spinlock); node = rb_next(node); - if ( !selective ) - /* FIXME: should be obj,1 but walking/erasing rbtree is racy */ - obj_destroy(obj,0); - else if ( obj->last_client == cli_id ) - obj_destroy(obj,0); + if ( obj->last_client == cli_id ) + obj_destroy(obj); else spin_unlock(&obj->obj_spinlock); } @@ -1088,7 +1083,7 @@ static int shared_pool_quit(struct tmem_pool *pool, domid_t cli_id) ASSERT(pool->client != NULL); ASSERT_WRITELOCK(&tmem_rwlock); - pool_destroy_objs(pool,1,cli_id); + pool_destroy_objs(pool, cli_id); list_for_each_entry(sl,&pool->share_list, share_list) { if (sl->client->cli_id != cli_id) @@ -1134,7 +1129,7 @@ static void pool_flush(struct tmem_pool *pool, domid_t cli_id, bool_t destroy) destroy?"destroy":"flush", tmem_client_str); return; } - pool_destroy_objs(pool,0,TMEM_CLI_ID_NULL); + pool_destroy_objs(pool, TMEM_CLI_ID_NULL); if ( destroy ) { pool->client->pools[pool->pool_id] = NULL; @@ -1339,7 +1334,7 @@ found: if ( obj->pgp_count == 0 ) { ASSERT_WRITELOCK(&pool->pool_rwlock); - obj_free(obj,0); + obj_free(obj); } else spin_unlock(&obj->obj_spinlock); @@ -1518,7 +1513,7 @@ cleanup: if ( obj->pgp_count == 0 ) { write_lock(&pool->pool_rwlock); - obj_free(obj,0); + obj_free(obj); write_unlock(&pool->pool_rwlock); } else { spin_unlock(&obj->obj_spinlock); @@ -1679,7 +1674,7 @@ unlock_obj: if ( newobj ) { write_lock(&pool->pool_rwlock); - obj_free(obj, 0); + obj_free(obj); write_unlock(&pool->pool_rwlock); } else @@ -1737,7 +1732,7 @@ static int do_tmem_get(struct tmem_pool *pool, struct oid *oidp, uint32_t index, if ( obj->pgp_count == 0 ) { write_lock(&pool->pool_rwlock); - obj_free(obj,0); + obj_free(obj); obj = NULL; write_unlock(&pool->pool_rwlock); } @@ -1787,7 +1782,7 @@ static int do_tmem_flush_page(struct tmem_pool *pool, struct oid *oidp, uint32_t if ( obj->pgp_count == 0 ) { write_lock(&pool->pool_rwlock); - obj_free(obj,0); + obj_free(obj); write_unlock(&pool->pool_rwlock); } else { spin_unlock(&obj->obj_spinlock); @@ -1810,7 +1805,7 @@ static int do_tmem_flush_object(struct tmem_pool *pool, struct oid *oidp) if ( obj == NULL ) goto out; write_lock(&pool->pool_rwlock); - obj_destroy(obj,0); + obj_destroy(obj); pool->flush_objs_found++; write_unlock(&pool->pool_rwlock); -- 1.7.10.4