diff options
| author | Kevin Vigor <kvigor@fb.com> | 2017-01-05 12:21:20 -0800 |
|---|---|---|
| committer | Kevin Vigor <kvigor@fb.com> | 2017-01-05 12:21:20 -0800 |
| commit | c27aa58e72cf528583c585691e65abdb765535e5 (patch) | |
| tree | fae75e5b924ac4fb80a3d4ed42203638732fbb52 /libglusterfs/src/mem-pool.c | |
| parent | 63403742f53ec59a6acbe26ff4c39bab1b0842ed (diff) | |
| parent | cb8bc3396d16e777d9a2683886fefd43e747e8a3 (diff) | |
Merge remote-tracking branch 'origin/release-3.8' into merge-3.8-again
Change-Id: I844adf2aef161a44d446f8cd9b7ebcb224ee618a
Signed-off-by: Kevin Vigor <kvigor@fb.com>
Diffstat (limited to 'libglusterfs/src/mem-pool.c')
| -rw-r--r-- | libglusterfs/src/mem-pool.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libglusterfs/src/mem-pool.c b/libglusterfs/src/mem-pool.c index 40e80d5c33e..4d81ade8b60 100644 --- a/libglusterfs/src/mem-pool.c +++ b/libglusterfs/src/mem-pool.c @@ -422,7 +422,11 @@ mem_pool_new_fn (unsigned long sizeof_type, if (!ctx) goto out; - list_add (&mem_pool->global_list, &ctx->mempool_list); + LOCK (&ctx->lock); + { + list_add (&mem_pool->global_list, &ctx->mempool_list); + } + UNLOCK (&ctx->lock); out: return mem_pool; |