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-dir-write.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-dir-write.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-dir-write.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c index f996181cd2e..3bf9facd610 100644 --- a/xlators/cluster/afr/src/afr-dir-write.c +++ b/xlators/cluster/afr/src/afr-dir-write.c @@ -147,6 +147,7 @@ afr_mark_new_entry_changelog (call_frame_t *frame, xlator_t *this) afr_private_t *priv = NULL; dict_t **xattr = NULL; int32_t **changelog = NULL; + int call_count = -1; int i = 0; GF_UNUSED int op_errno = 0; @@ -186,6 +187,7 @@ afr_mark_new_entry_changelog (call_frame_t *frame, xlator_t *this) uuid_copy (new_local->loc.gfid, local->cont.dir_fop.buf.ia_gfid); new_local->loc.inode = inode_ref (local->cont.dir_fop.inode); new_local->call_count = local->success_count; + call_count = new_local->call_count; for (i = 0; i < priv->child_count; i++) { if (local->child_errno[i]) @@ -197,6 +199,8 @@ afr_mark_new_entry_changelog (call_frame_t *frame, xlator_t *this) priv->children[i]->fops->xattrop, &new_local->loc, GF_XATTROP_ADD_ARRAY, xattr[i], NULL); + if (!--call_count) + break; } new_frame = NULL; out: |