summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/rbthash.c
diff options
context:
space:
mode:
authorshishir gowda <shishirng@gluster.com>2011-08-10 16:58:38 +0530
committerVijay Bellur <vijay@gluster.com>2011-08-25 12:01:08 -0700
commitcd567c063ec25b280d3fb5686a69b068c2d6d6df (patch)
tree636ed83dc9b7e4d7e019dcfc59bbc722f066e2e6 /libglusterfs/src/rbthash.c
parent9c68f3b53ffd27ea03e90da883c43e84bf94dd15 (diff)
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 <amar@gluster.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'libglusterfs/src/rbthash.c')
-rw-r--r--libglusterfs/src/rbthash.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/libglusterfs/src/rbthash.c b/libglusterfs/src/rbthash.c
index c134c3a..beda672 100644
--- a/libglusterfs/src/rbthash.c
+++ b/libglusterfs/src/rbthash.c
@@ -201,7 +201,7 @@ rbthash_init_entry (rbthash_table_t *tbl, void *data, void *key, int keylen)
ret = 0;
free_entry:
if (ret == -1) {
- mem_put (tbl->entrypool, entry);
+ mem_put (entry);
entry = NULL;
}
@@ -230,7 +230,7 @@ rbthash_deinit_entry (rbthash_table_t *tbl, rbthash_entry_t *entry)
}
UNLOCK (&tbl->tablelock);
- mem_put (tbl->entrypool, entry);
+ mem_put (entry);
}
return;
@@ -398,7 +398,7 @@ rbthash_remove (rbthash_table_t *tbl, void *key, int keylen)
}
UNLOCK (&tbl->tablelock);
- mem_put (tbl->entrypool, entry);
+ mem_put (entry);
return dataref;
}