cluster/afr: Perform flush on all the children involved in self-heal

Change-Id: I66362a3087a635fb7b759d7836a1f6564a6a7fc9
BUG: 3456
Reviewed-on: http://review.gluster.com/294
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>

1 files changed, 6 insertions, 19 deletions

diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c
index 5db2d94f5cb..60f42c54b14 100644
--- a/xlators/cluster/afr/src/afr-self-heal-data.c
+++ b/xlators/cluster/afr/src/afr-self-heal-data.c
@@ -119,36 +119,23 @@ afr_sh_data_close (call_frame_t *frame, xlator_t *this)
         afr_self_heal_t *sh         = NULL;
         int              i          = 0;
         int              call_count = 0;
-        int              source     = 0;
 
         local = frame->local;
         sh    = &local->self_heal;
         priv  = this->private;
 
-        source = sh->source;
-
-        call_count        = (sh->active_sinks + 1);
+        call_count        = afr_set_elem_count_get (sh->success,
+                                                    priv->child_count);
         local->call_count = call_count;
 
-        /* closed source */
-        gf_log (this->name, GF_LOG_DEBUG,
-                "closing fd of %s on %s",
-                local->loc.path, priv->children[sh->source]->name);
-
-        STACK_WIND_COOKIE (frame, afr_sh_data_flush_cbk,
-                           (void *) (long) sh->source,
-                           priv->children[sh->source],
-                           priv->children[sh->source]->fops->flush,
-                           sh->healing_fd);
-        call_count--;
-
-        if (call_count == 0)
+        if (call_count == 0) {
+                afr_sh_data_done (frame, this);
                 return 0;
+        }
 
         for (i = 0; i < priv->child_count; i++) {
-                if (sh->sources[i] || !local->child_up[i])
+                if (!sh->success[i])
                         continue;
-
                 gf_log (this->name, GF_LOG_DEBUG,
                         "closing fd of %s on %s",
                         local->loc.path, priv->children[i]->name);