summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSoumya Koduri <skoduri@redhat.com>2015-07-23 12:58:02 +0530
committerKaleb KEITHLEY <kkeithle@redhat.com>2015-07-27 10:09:51 -0700
commitca67ac071c56a3bd6f2b2ba3a958f0305db50a3d (patch)
treeabb1e5f3a3282653bb16a43e6dbfb86ed5b3832b
parentb23c4b4e22628ab9ddc0c8341360a53d3f9d658d (diff)
Revert "core: avoid crashes in gf_msg dup-detection code"
This reverts commit 765849ee00f6661c9059122ff2346b03b224745f. With http://review.gluster.org/#/c/10417/, struct mem_accnt is no longer embedded in a xlator_t object, but instead is allocated separately. Hence this workaround provided to avoid crashes in logging infrastructure is no longer needed. Change-Id: I460b62780f570cd9873bad17d9327eefc17a1355 Signed-off-by: Soumya Koduri <skoduri@redhat.com> Reviewed-on: http://review.gluster.org/11746 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Poornima G <pgurusid@redhat.com> Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
-rw-r--r--libglusterfs/src/logging.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/libglusterfs/src/logging.c b/libglusterfs/src/logging.c
index 70149a2fd3c..147ee383751 100644
--- a/libglusterfs/src/logging.c
+++ b/libglusterfs/src/logging.c
@@ -292,18 +292,6 @@ log_buf_init (log_buf_t *buf, const char *domain, const char *file,
int errnum, uint64_t msgid, char **appmsgstr, int graph_id)
{
int ret = -1;
- xlator_t *old_THIS;
- extern xlator_t global_xlator;
-
- /*
- * The current translator will be put in the block header for any
- * memory block we allocate here. Unfortunately, these objects might
- * outlive the current translator, and if we then try to dereference
- * that pointer we go BOOM. Since this is really a global structure,
- * use the global translator.
- */
- old_THIS = THIS;
- THIS = &global_xlator;
if (!buf || !domain || !file || !function || !appmsgstr || !*appmsgstr)
goto out;
@@ -334,7 +322,6 @@ log_buf_init (log_buf_t *buf, const char *domain, const char *file,
ret = 0;
out:
- THIS = old_THIS;
return ret;
}