summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Hernandez <xhernandez@datalab.es>2014-10-01 20:41:58 +0200
committerVijay Bellur <vbellur@redhat.com>2014-10-03 09:41:33 -0700
commitdee517728dbccf40077f45a286e9678f2aede8df (patch)
treecdad5651cf7418f0442ba96ca008c2eed621698e
parent473c34f895c49bf2bd327ece586d3613cd86c068 (diff)
ec: Fix memory leak caused by undestroyed fops
Operations processed by ec_dispatch_one() were not correctly completed by ec_complete(), leaving some structures in memory. Now ec_complete() also calls ec_resume() for this type of fops. Change-Id: Iaf0f2e8227399ebb735db9f1bd007593e0ece041 BUG: 1148520 Signed-off-by: Xavier Hernandez <xhernandez@datalab.es> Reviewed-on: http://review.gluster.org/8896 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Vijay Bellur <vbellur@redhat.com>
-rw-r--r--xlators/cluster/ec/src/ec-common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c
index a7cf23d24bb..4d7beee63b9 100644
--- a/xlators/cluster/ec/src/ec-common.c
+++ b/xlators/cluster/ec/src/ec-common.c
@@ -328,7 +328,7 @@ void ec_complete(ec_fop_data_t * fop)
if (--fop->winds == 0)
{
- if ((fop->answer == NULL) && (fop->expected != 1))
+ if (fop->answer == NULL)
{
if (!list_empty(&fop->cbk_list))
{