From 58aba738ef73fae01748ddf49c3f7ad03ecf733c Mon Sep 17 00:00:00 2001 From: Xavier Hernandez Date: Wed, 1 Oct 2014 20:41:58 +0200 Subject: 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. This is a backport of http://review.gluster.org/8896/ Change-Id: Iaf0f2e8227399ebb735db9f1bd007593e0ece041 BUG: 1148521 Signed-off-by: Xavier Hernandez Reviewed-on: http://review.gluster.org/8897 Tested-by: Gluster Build System Reviewed-by: Dan Lambright Reviewed-by: Vijay Bellur --- xlators/cluster/ec/src/ec-common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xlators') 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)) { -- cgit