summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/afr/src/afr-self-heal-entry.c
diff options
context:
space:
mode:
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-entry.c')
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-entry.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c
index dc1546c7403..97397c1b098 100644
--- a/xlators/cluster/afr/src/afr-self-heal-entry.c
+++ b/xlators/cluster/afr/src/afr-self-heal-entry.c
@@ -342,6 +342,8 @@ unlock:
locked_on);
if (inode)
inode_unref (inode);
+ if (replies)
+ afr_replies_wipe (replies, priv->child_count);
return ret;
}
@@ -404,8 +406,7 @@ afr_selfheal_entry_do_subvol (call_frame_t *frame, xlator_t *this, fd_t *fd,
static int
afr_selfheal_entry_do (call_frame_t *frame, xlator_t *this, fd_t *fd,
int source, unsigned char *sources,
- unsigned char *healed_sinks,
- struct afr_reply *locked_replies)
+ unsigned char *healed_sinks)
{
int i = 0;
afr_private_t *priv = NULL;
@@ -431,8 +432,7 @@ afr_selfheal_entry_do (call_frame_t *frame, xlator_t *this, fd_t *fd,
static int
__afr_selfheal_entry_finalize_source (xlator_t *this, unsigned char *sources,
unsigned char *healed_sinks,
- unsigned char *locked_on,
- struct afr_reply *replies)
+ unsigned char *locked_on)
{
int i = 0;
afr_private_t *priv = NULL;
@@ -493,8 +493,7 @@ __afr_selfheal_entry_prepare (call_frame_t *frame, xlator_t *this, fd_t *fd,
AFR_INTERSECT (healed_sinks, sinks, locked_on, priv->child_count);
source = __afr_selfheal_entry_finalize_source (this, sources,
- healed_sinks,
- locked_on, replies);
+ healed_sinks, locked_on);
if (source < 0) {
/* If source is < 0 (typically split-brain), we perform a
conservative merge of entries rather than erroring out */
@@ -546,7 +545,7 @@ unlock:
goto out;
ret = afr_selfheal_entry_do (frame, this, fd, source, sources,
- healed_sinks, locked_replies);
+ healed_sinks);
if (ret)
goto out;
@@ -554,6 +553,8 @@ unlock:
healed_sinks, AFR_ENTRY_TRANSACTION,
locked_replies, data_lock);
out:
+ if (locked_replies)
+ afr_replies_wipe (locked_replies, priv->child_count);
return ret;
}