diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2015-03-11 16:41:06 +0530 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2015-03-11 21:14:38 -0700 |
| commit | 147b3871180a699a642767d0cc0ea00fa69a33c8 (patch) | |
| tree | 0671c7954f3fdc59c73a356649a7c403c0d0ff89 /xlators/cluster/afr/src/afr-self-heal-data.c | |
| parent | 526448e784317e3c9ec72e1641f82b28959b696d (diff) | |
afr: exit out of stack winds in for loops if call_count is zero
....in order to avoid a race where the fop cbk frees the frame's local
variables and the fop tries to access it at a later point in time.
Change-Id: I91d2696e5e183c61ea1368b3a538f9ed7f3851de
BUG: 1200764
Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/9856
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: pranith karampuri <pranith.k@gmail.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-data.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-data.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c index f85e7247be4..d7c112d132f 100644 --- a/xlators/cluster/afr/src/afr-self-heal-data.c +++ b/xlators/cluster/afr/src/afr-self-heal-data.c @@ -497,6 +497,8 @@ afr_sh_data_fsync (call_frame_t *frame, xlator_t *this) (void *) (long) i, priv->children[i], priv->children[i]->fops->fsync, sh->healing_fd, 1, NULL); + if (!--call_count) + break; } return 0; @@ -1225,9 +1227,9 @@ afr_sh_data_fstat (call_frame_t *frame, xlator_t *this) priv->children[child], priv->children[child]->fops->fstat, sh->healing_fd, NULL); - --call_count; + if (!--call_count) + break; } - GF_ASSERT (!call_count); out: GF_FREE (fstat_children); return 0; |