From e3e7cdbde5463ff6d20af52329a784ca629c6aef Mon Sep 17 00:00:00 2001 From: Mohit Agrawal Date: Sun, 18 Feb 2018 08:14:35 +0530 Subject: 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 --- xlators/features/leases/src/leases.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'xlators/features/leases/src/leases.c') diff --git a/xlators/features/leases/src/leases.c b/xlators/features/leases/src/leases.c index ebee682a685..d4fdbfb7ea1 100644 --- a/xlators/features/leases/src/leases.c +++ b/xlators/features/leases/src/leases.c @@ -1041,17 +1041,14 @@ fini (xlator_t *this) priv->fini = _gf_true; pthread_cond_broadcast (&priv->cond); - if (priv->recall_thr) { - gf_thread_cleanup_xint (priv->recall_thr); - priv->recall_thr = 0; - priv->inited_recall_thr = _gf_false; - } + pthread_join (priv->recall_thr, NULL); + + priv->inited_recall_thr = _gf_false; GF_FREE (priv); - if (this->ctx->tw) { - glusterfs_ctx_tw_put (this->ctx); - this->ctx->tw = NULL; - } + + glusterfs_ctx_tw_put (this->ctx); + return 0; } -- cgit