diff options
| author | Pranith Kumar K <pkarampu@redhat.com> | 2018-02-28 17:58:31 +0530 |
|---|---|---|
| committer | Shyamsundar Ranganathan <srangana@redhat.com> | 2018-03-03 04:33:26 +0000 |
| commit | de000fd58d783e8a8fce3a6c7f5b85be3c1b7178 (patch) | |
| tree | 246854ba951da9e46fa363906d9ba20cff4a71c2 /xlators/cluster/afr/src/afr-common.c | |
| parent | cec4c7f19b7b8cfd69fb439201658b654dcb4168 (diff) | |
cluster/afr: Fix dict-leak in pre-op
At the time of pre-op, pre_op_xdata is populted with the xattrs we get from the
disk and at the time of post-op it gets over-written without unreffing the
previous value stored leading to a leak.
This is a regression we missed in
https://review.gluster.org/#/q/ba149bac92d169ae2256dbc75202dc9e5d06538e
>BUG: 1550078
>Change-Id: I0456f9ad6f77ce6248b747964a037193af3a3da7
>Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
>(cherry picked from commit e7b79c59590c203c65f7ac8548b30d068c232d33)
BUG: 1550808
Change-Id: I0456f9ad6f77ce6248b747964a037193af3a3da7
Diffstat (limited to 'xlators/cluster/afr/src/afr-common.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-common.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c index 96419c6df5a..ea3df12b8bb 100644 --- a/xlators/cluster/afr/src/afr-common.c +++ b/xlators/cluster/afr/src/afr-common.c @@ -1033,7 +1033,7 @@ afr_readables_fill (call_frame_t *frame, xlator_t *this, inode_t *inode, xdata = replies[i].xdata; ia_type = replies[i].poststat.ia_type; } else {/* pre-op xattrop */ - xdata = local->transaction.pre_op_xdata[i]; + xdata = local->transaction.changelog_xdata[i]; ia_type = inode->ia_type; } @@ -1764,13 +1764,13 @@ afr_local_transaction_cleanup (afr_local_t *local, xlator_t *this) GF_FREE (local->transaction.pre_op); GF_FREE (local->transaction.pre_op_sources); - if (local->transaction.pre_op_xdata) { + if (local->transaction.changelog_xdata) { for (i = 0; i < priv->child_count; i++) { - if (!local->transaction.pre_op_xdata[i]) + if (!local->transaction.changelog_xdata[i]) continue; - dict_unref (local->transaction.pre_op_xdata[i]); + dict_unref (local->transaction.changelog_xdata[i]); } - GF_FREE (local->transaction.pre_op_xdata); + GF_FREE (local->transaction.changelog_xdata); } GF_FREE (local->transaction.eager_lock); @@ -5603,10 +5603,10 @@ afr_transaction_local_init (afr_local_t *local, xlator_t *this) if (!local->transaction.pre_op) goto out; - local->transaction.pre_op_xdata = - GF_CALLOC (sizeof (*local->transaction.pre_op_xdata), + local->transaction.changelog_xdata = + GF_CALLOC (sizeof (*local->transaction.changelog_xdata), priv->child_count, gf_afr_mt_dict_t); - if (!local->transaction.pre_op_xdata) + if (!local->transaction.changelog_xdata) goto out; if (priv->arbiter_count == 1) { |