3 files changed, 8 insertions, 3 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 795e43b8bd4..95c363cea69 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -1019,7 +1019,10 @@ afr_inode_refresh_done (call_frame_t *frame, xlator_t *this)
                 }
                 heal_local->refreshinode = inode_ref (local->refreshinode);
                 heal_local->heal_frame = heal_frame;
-                afr_throttled_selfheal (heal_frame, this);
+                if (!afr_throttled_selfheal (heal_frame, this)) {
+                        AFR_STACK_DESTROY (heal_frame);
+                        goto refresh_done;
+                }
         }
 
 refresh_done:
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c
index 58db6d1e497..faee8dbb89b 100644
--- a/xlators/cluster/afr/src/afr-self-heal-common.c
+++ b/xlators/cluster/afr/src/afr-self-heal-common.c
@@ -1985,7 +1985,7 @@ afr_heal_synctask (xlator_t *this, afr_local_t *local)
                 afr_refresh_heal_done (ret, heal_frame, heal_frame);
 }
 
-void
+gf_boolean_t
 afr_throttled_selfheal (call_frame_t *frame, xlator_t *this)
 {
         gf_boolean_t can_heal = _gf_true;
@@ -2013,6 +2013,8 @@ afr_throttled_selfheal (call_frame_t *frame, xlator_t *this)
                         gf_msg_debug (this->name, 0, "Max number of heals are "
                                       "pending, background self-heal rejected.");
         }
+
+        return can_heal;
 }
 
 int
diff --git a/xlators/cluster/afr/src/afr-self-heal.h b/xlators/cluster/afr/src/afr-self-heal.h
index ec5337e60b2..1705c967f60 100644
--- a/xlators/cluster/afr/src/afr-self-heal.h
+++ b/xlators/cluster/afr/src/afr-self-heal.h
@@ -85,7 +85,7 @@
 int
 afr_selfheal (xlator_t *this, uuid_t gfid);
 
-void
+gf_boolean_t
 afr_throttled_selfheal (call_frame_t *frame, xlator_t *this);
 
 int