summaryrefslogtreecommitdiffstats
path: root/xlators/features/changelog/lib/src/gf-changelog.c
diff options
context:
space:
mode:
authorKotresh HR <khiremat@redhat.com>2015-03-31 20:13:59 +0530
committerVenky Shankar <vshankar@redhat.com>2015-04-03 03:30:23 -0700
commit00d4125a5cb7102efeb23873cbaf155a71faa9dd (patch)
treef8c34886cba49370d674bd0f995b4b6ab3dc9ed5 /xlators/features/changelog/lib/src/gf-changelog.c
parent614dbff79f7003382c239c5c75c48e78ce5397f5 (diff)
libgfchangelog: Use correct 'this' pointer on new thread creation
When libgfchangelog is linked with non xlator application, it should point to 'master' xlator which is initiated separately. When ever a new thread is created, 'THIS' points to the global xlator. 'THIS' should point to corresponding xlator even then. This patch adjusts the pointer accordingly. Change-Id: I2a199bb3c73146a0329540aedcbae697a00f6f0a BUG: 1207643 Signed-off-by: Kotresh HR <khiremat@redhat.com> Reviewed-on: http://review.gluster.org/10074 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Venky Shankar <vshankar@redhat.com> Tested-by: Venky Shankar <vshankar@redhat.com>
Diffstat (limited to 'xlators/features/changelog/lib/src/gf-changelog.c')
-rw-r--r--xlators/features/changelog/lib/src/gf-changelog.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/xlators/features/changelog/lib/src/gf-changelog.c b/xlators/features/changelog/lib/src/gf-changelog.c
index 103a7b01eb0..f2a5135e12a 100644
--- a/xlators/features/changelog/lib/src/gf-changelog.c
+++ b/xlators/features/changelog/lib/src/gf-changelog.c
@@ -589,7 +589,10 @@ gf_changelog_register (char *brick_path, char *scratch_dir,
{
struct gf_brick_spec brick = {0,};
- THIS = master;
+ if (master)
+ THIS = master;
+ else
+ return -1;
brick.brick_path = brick_path;
brick.filter = CHANGELOG_OP_TYPE_JOURNAL;