diff options
| author | Mohit Agrawal <moagrawa@redhat.com> | 2018-05-23 09:10:11 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-05-25 02:05:37 +0000 |
| commit | b679fd4b73d9ec039029088769722887b61d750a (patch) | |
| tree | 1fba7b4d16dea3ffa8808475d5d5cb44a3256bd1 /xlators/features/index/src/index.c | |
| parent | 7b95d5a4b3988757bf8c91f82dcaf86ed3da6875 (diff) | |
Revert "glusterfsd: Memleak in glusterfsd process while brick mux is on"
Updates: bz#1582286
This reverts commit 7c3cc485054e4ede1efb358552135b432fb7047a.
Change-Id: I831d646112bcfa13d0c2153482ad00ff1b23aa6c
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
Diffstat (limited to 'xlators/features/index/src/index.c')
| -rw-r--r-- | xlators/features/index/src/index.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/xlators/features/index/src/index.c b/xlators/features/index/src/index.c index f39d901d624..152b52dfc33 100644 --- a/xlators/features/index/src/index.c +++ b/xlators/features/index/src/index.c @@ -2451,13 +2451,6 @@ fini (xlator_t *this) priv = this->private; if (!priv) goto out; - - priv->down = _gf_true; - pthread_cond_broadcast (&priv->cond); - if (priv->thread) { - gf_thread_cleanup_xint (priv->thread); - priv->thread = 0; - } this->private = NULL; LOCK_DESTROY (&priv->lock); pthread_cond_destroy (&priv->cond); @@ -2469,11 +2462,8 @@ fini (xlator_t *this) if (priv->complete_watchlist) dict_unref (priv->complete_watchlist); GF_FREE (priv); - - if (this->local_pool) { - mem_pool_destroy (this->local_pool); - this->local_pool = NULL; - } + mem_pool_destroy (this->local_pool); + this->local_pool = NULL; out: return; } @@ -2543,6 +2533,13 @@ notify (xlator_t *this, int event, void *data, ...) if (!priv) return 0; + switch (event) { + case GF_EVENT_CLEANUP: + priv->down = _gf_true; + pthread_cond_broadcast (&priv->cond); + break; + } + ret = default_notify (this, event, data); return ret; } |