diff options
Diffstat (limited to 'xlators/cluster/afr/src/afr-dir-write.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-dir-write.c | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/xlators/cluster/afr/src/afr-dir-write.c b/xlators/cluster/afr/src/afr-dir-write.c index 6d4a35228a1..921b73c295d 100644 --- a/xlators/cluster/afr/src/afr-dir-write.c +++ b/xlators/cluster/afr/src/afr-dir-write.c @@ -106,18 +106,21 @@ __afr_dir_write_finalize (call_frame_t *frame, xlator_t *this) if (local->inode) { afr_replies_interpret (frame, this, local->inode, NULL); inode_read_subvol = afr_data_subvol_get (local->inode, this, - NULL, NULL, &args); + NULL, NULL, NULL, &args); } if (local->parent) parent_read_subvol = afr_data_subvol_get (local->parent, this, - NULL, NULL, NULL); + NULL, local->readable, NULL, NULL); + if (local->parent2) parent2_read_subvol = afr_data_subvol_get (local->parent2, this, - NULL, NULL, NULL); + NULL, local->readable2, NULL, NULL); local->op_ret = -1; local->op_errno = afr_final_errno (local, priv); + afr_pick_error_xdata (local, priv, local->parent, local->readable, + local->parent2, local->readable2); for (i = 0; i < priv->child_count; i++) { if (!local->replies[i].valid) @@ -149,6 +152,11 @@ __afr_dir_write_finalize (call_frame_t *frame, xlator_t *this) local->replies[i].preparent2; local->cont.dir_fop.postnewparent = local->replies[i].postparent2; + if (local->xdata_rsp) { + dict_unref (local->xdata_rsp); + local->xdata_rsp = NULL; + } + if (local->replies[i].xdata) local->xdata_rsp = dict_ref (local->replies[i].xdata); @@ -201,6 +209,9 @@ __afr_dir_write_fill (call_frame_t *frame, xlator_t *this, int child_index, local->replies[child_index].valid = 1; local->replies[child_index].op_ret = op_ret; local->replies[child_index].op_errno = op_errno; + if (xdata) + local->replies[child_index].xdata = dict_ref (xdata); + if (op_ret >= 0) { if (poststat) @@ -213,9 +224,6 @@ __afr_dir_write_fill (call_frame_t *frame, xlator_t *this, int child_index, local->replies[child_index].preparent2 = *preparent2; if (postparent2) local->replies[child_index].postparent2 = *postparent2; - if (xdata) - local->replies[child_index].xdata = dict_ref (xdata); - if (fd_ctx) fd_ctx->opened_on[child_index] = AFR_FD_OPENED; } else { |