diff options
| author | Mohit Agrawal <moagrawa@redhat.com> | 2018-02-18 08:14:35 +0530 |
|---|---|---|
| committer | Amar Tumballi <amarts@redhat.com> | 2018-02-19 19:30:56 +0000 |
| commit | e3e7cdbde5463ff6d20af52329a784ca629c6aef (patch) | |
| tree | 43887efd6a9c624ac204ad6bba6065baba2ab1cf /xlators/features/upcall/src/upcall.c | |
| parent | 8d9961e63786cf8a9bb9e2f4140ab9a77f1ccbe3 (diff) | |
Revert "glusterfsd: Memleak in glusterfsd process while brick mux is on"
There are still remain some code paths where cleanup is required while
brick mux is on.I will upload a new patch after resolve all code paths.
This reverts commit b313d97faa766443a7f8128b6e19f3d2f1b267dd.
BUG: 1544090
Change-Id: I26ef1d29061092bd9a409c8933d5488e968ed90e
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Diffstat (limited to 'xlators/features/upcall/src/upcall.c')
| -rw-r--r-- | xlators/features/upcall/src/upcall.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/xlators/features/upcall/src/upcall.c b/xlators/features/upcall/src/upcall.c index d68bf5aa99a..b9b4bc9d725 100644 --- a/xlators/features/upcall/src/upcall.c +++ b/xlators/features/upcall/src/upcall.c @@ -2446,11 +2446,8 @@ fini (xlator_t *this) priv->fini = 1; - if (priv->reaper_thr) { - gf_thread_cleanup_xint (priv->reaper_thr); - priv->reaper_thr = 0; - priv->reaper_init_done = _gf_false; - } + if (priv->reaper_init_done) + pthread_join (priv->reaper_thr, NULL); dict_unref (priv->xattrs); LOCK_DESTROY (&priv->inode_ctx_lk); @@ -2460,11 +2457,6 @@ fini (xlator_t *this) * before calling xlator_fini */ GF_FREE (priv); - if (this->local_pool) { - mem_pool_destroy (this->local_pool); - this->local_pool = NULL; - } - return 0; } |