summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaghavendra Bhat <raghavendra@redhat.com>2015-06-23 00:25:38 +0530
committerRaghavendra G <rgowdapp@redhat.com>2015-06-23 23:11:45 -0700
commit01e42f25ebdc44847e8b1dce02f7fd486b40dbc2 (patch)
treef19807bd824c81c1bebe3a1b36a941cd0edbeaa3
parent2b645af1d077957829c8ff6b8ab56353ba3913d6 (diff)
Revert "quota/marker: fix mem-leak, free contribution node"
This reverts commit 8ab6608accb62d6320d1fc1fbe651fcafd376270. This patch is resulting in memory corruption: http://build.gluster.org/job/rackspace-regression-2GB-triggered/11193/consoleFull contribution object might be being used by some other transaction when we free it. The correct way to handle this is to have a reference based scheme to manage the contribution object. Change-Id: Idf9993ed8268029073a3e2d699865587f20d9aea BUG: 1207735 Signed-off-by: Raghavendra Bhat <raghavendra@redhat.com> Reviewed-on: http://review.gluster.org/11362 Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Tested-by: Raghavendra G <rgowdapp@redhat.com>
-rw-r--r--xlators/features/marker/src/marker-quota.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/xlators/features/marker/src/marker-quota.c b/xlators/features/marker/src/marker-quota.c
index 7c67ec6dc7c..c33d8a46707 100644
--- a/xlators/features/marker/src/marker-quota.c
+++ b/xlators/features/marker/src/marker-quota.c
@@ -2606,8 +2606,6 @@ mq_remove_contri (xlator_t *this, loc_t *loc, inode_contribution_t *contri)
}
UNLOCK (&contri->lock);
- QUOTA_FREE_CONTRIBUTION_NODE (contri);
-
ret = 0;
out: