From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bob Liu Subject: [PATCH v2 06/11] tmem: cleanup: drop function tmem_alloc/free_infra Date: Fri, 8 Nov 2013 09:03:52 +0800 Message-ID: <1383872637-15486-7-git-send-email-bob.liu@oracle.com> References: <1383872637-15486-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 1VeaVq-0005NA-1h for xen-devel@lists.xenproject.org; Fri, 08 Nov 2013 01:05:26 +0000 Received: by mail-pd0-f178.google.com with SMTP id x10so1386286pdj.37 for ; Thu, 07 Nov 2013 17:05:22 -0800 (PST) In-Reply-To: <1383872637-15486-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: Bob Liu , keir@xen.org, ian.campbell@citrix.com, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org Useless function can be replaced by xmalloc/xfree directly. Signed-off-by: Bob Liu --- xen/common/tmem.c | 11 +++++------ xen/include/xen/tmem_xen.h | 14 -------------- 2 files changed, 5 insertions(+), 20 deletions(-) diff --git a/xen/common/tmem.c b/xen/common/tmem.c index 3d8e67f..589a515 100644 --- a/xen/common/tmem.c +++ b/xen/common/tmem.c @@ -1041,7 +1041,7 @@ static struct tmem_pool * pool_alloc(void) struct tmem_pool *pool; int i; - if ( (pool = tmem_alloc_infra(sizeof(struct tmem_pool),__alignof__(struct tmem_pool))) == NULL ) + if ( (pool = xmalloc(struct tmem_pool)) == NULL ) return NULL; for (i = 0; i < OBJ_HASH_BUCKETS; i++) pool->obj_rb_root[i] = RB_ROOT; @@ -1070,7 +1070,7 @@ static NOINLINE void pool_free(struct tmem_pool *pool) INVERT_SENTINEL(pool,POOL); pool->client = NULL; list_del(&pool->pool_list); - tmem_free_infra(pool); + xfree(pool); } /* register new_client as a user of this shared pool and return new @@ -1189,7 +1189,7 @@ static void pool_flush(struct tmem_pool *pool, domid_t cli_id, bool_t destroy) static struct client *client_create(domid_t cli_id) { - struct client *client = tmem_alloc_infra(sizeof(struct client),__alignof__(struct client)); + struct client *client = xzalloc(struct client); int i; tmem_client_info("tmem: initializing tmem capability for %s=%d...", @@ -1199,7 +1199,6 @@ static struct client *client_create(domid_t cli_id) tmem_client_err("failed... out of memory\n"); goto fail; } - memset(client,0,sizeof(struct client)); if ( (client->tmem = tmem_client_init(cli_id)) == NULL ) { tmem_client_err("failed... can't allocate host-dependent part of client\n"); @@ -1229,7 +1228,7 @@ static struct client *client_create(domid_t cli_id) return client; fail: - tmem_free_infra(client); + xfree(client); return NULL; } @@ -1237,7 +1236,7 @@ static void client_free(struct client *client) { list_del(&client->client_list); tmem_client_destroy(client->tmem); - tmem_free_infra(client); + xfree(client); } /* flush all data from a client and, optionally, free it */ diff --git a/xen/include/xen/tmem_xen.h b/xen/include/xen/tmem_xen.h index bbe1eb6..d4eafaf 100644 --- a/xen/include/xen/tmem_xen.h +++ b/xen/include/xen/tmem_xen.h @@ -245,20 +245,6 @@ static inline unsigned long tmem_free_mb(void) return (tmem_page_list_pages + total_free_pages()) >> (20 - PAGE_SHIFT); } -/* - * Memory allocation for "infrastructure" data - */ - -static inline void *tmem_alloc_infra(size_t size, size_t align) -{ - return _xmalloc(size,align); -} - -static inline void tmem_free_infra(void *p) -{ - return xfree(p); -} - #define tmem_lock_all opt_tmem_lock #define tmem_called_from_tmem(_memflags) (_memflags & MEMF_tmem) -- 1.7.10.4