diff options
| author | Xavier Hernandez <xhernandez@datalab.es> | 2014-10-01 20:41:58 +0200 |
|---|---|---|
| committer | Vijay Bellur <vbellur@redhat.com> | 2014-10-03 02:02:12 -0700 |
| commit | 58aba738ef73fae01748ddf49c3f7ad03ecf733c (patch) | |
| tree | d77aaadcd3d1421b138559e252b624b1159e3b5a | |
| parent | eaf464c9499d02be81909262790c5ef57067f4bf (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.
This is a backport of http://review.gluster.org/8896/
Change-Id: Iaf0f2e8227399ebb735db9f1bd007593e0ece041
BUG: 1148521
Signed-off-by: Xavier Hernandez <xhernandez@datalab.es>
Reviewed-on: http://review.gluster.org/8897
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Dan Lambright <dlambrig@redhat.com>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
| -rw-r--r-- | xlators/cluster/ec/src/ec-common.c | 2 |
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)) { |