summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--api/src/glfs.c2
-rw-r--r--libglusterfs/src/mem-pool.c6
2 files changed, 5 insertions, 3 deletions
diff --git a/api/src/glfs.c b/api/src/glfs.c
index 9a92fa97c3d..4f742b2847c 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -155,8 +155,6 @@ glusterfs_ctx_defaults_init (glusterfs_ctx_t *ctx)
LOCK_INIT (&pool->lock);
ctx->pool = pool;
- pthread_mutex_init (&(ctx->lock), NULL);
-
ret = 0;
err:
if (ret && pool) {
diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c
index 7674913bbdc..91e663c1617 100644
--- a/libglusterfs/src/mem-pool.c
+++ b/libglusterfs/src/mem-pool.c
@@ -421,7 +421,11 @@ mem_pool_new_fn (unsigned long sizeof_type,
if (!ctx)
goto out;
- list_add (&mem_pool->global_list, &ctx->mempool_list);
+ pthread_mutex_lock (&ctx->lock);
+ {
+ list_add (&mem_pool->global_list, &ctx->mempool_list);
+ }
+ pthread_mutex_unlock (&ctx->lock);
out:
return mem_pool;