From cd567c063ec25b280d3fb5686a69b068c2d6d6df Mon Sep 17 00:00:00 2001 From: shishir gowda Date: Wed, 10 Aug 2011 16:58:38 +0530 Subject: mem-pool: Make mem-pool ptr avialable in ptr The header of the ptr returned from mem-pool will now store the mem-pool ptr it belongs to. mem_put will now take only the pointer to be freed. Also, changing MALLOC call to GF_CALLOC in mem_get when we run out of entries in mem-pool. This also will have the header information saved. Change-Id: I3de182663a7f5b49c9e9425e9531775b70bdff67 BUG: 3390 Reviewed-on: http://review.gluster.com/205 Reviewed-by: Amar Tumballi Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- libglusterfs/src/inode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libglusterfs/src/inode.c') diff --git a/libglusterfs/src/inode.c b/libglusterfs/src/inode.c index a3709cdb34d..1b43203113f 100644 --- a/libglusterfs/src/inode.c +++ b/libglusterfs/src/inode.c @@ -154,7 +154,7 @@ __dentry_unset (dentry_t *dentry) dentry->parent = NULL; } - mem_put (tmp_pool, dentry); + mem_put (dentry); tmp_pool = NULL; } @@ -336,7 +336,7 @@ __inode_destroy (inode_t *inode) noctx: LOCK_DESTROY (&inode->lock); // memset (inode, 0xb, sizeof (*inode)); - mem_put (tmp_pool, inode); + mem_put (inode); tmp_pool = NULL; } @@ -501,7 +501,7 @@ __dentry_create (inode_t *inode, inode_t *parent, const char *name) newd->name = gf_strdup (name); if (newd->name == NULL) { - mem_put (parent->table->dentry_pool, newd); + mem_put (newd); newd = NULL; goto out; } @@ -547,7 +547,7 @@ __inode_create (inode_table_t *table) if (newi->_ctx == NULL) { LOCK_DESTROY (&newi->lock); - mem_put (table->inode_pool, newi); + mem_put (newi); newi = NULL; goto out; } -- cgit