summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src/glusterd-handler.c
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2012-10-13 12:06:14 +0530
committerAnand Avati <avati@redhat.com>2012-10-16 14:23:51 -0700
commitbccb4b7a63eaa5e32b34c90dfdd5efa5c99b546a (patch)
tree552c716f6e1a2c0c3c7c83e38475d9904d0dbead /xlators/mgmt/glusterd/src/glusterd-handler.c
parent22050e51e876c5756e255cd707036cca8b8d544c (diff)
mgmt/glusterd: avoid directly using conf->uuid
Change-Id: I398c8741b02aa2f34d428c948e93f422e520a9ab BUG: 862834 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/4084 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Krishnan Parthasarathi <kparthas@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-handler.c')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-handler.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
index ae4138ebe7a..a3106342d6c 100644
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
@@ -1777,7 +1777,7 @@ glusterd_handle_probe_query (rpcsvc_request_t *req)
}
respond:
- uuid_copy (rsp.uuid, conf->uuid);
+ uuid_copy (rsp.uuid, MY_UUID);
rsp.hostname = probe_req.hostname;
@@ -2341,7 +2341,7 @@ glusterd_xfer_friend_remove_resp (rpcsvc_request_t *req, char *hostname, int por
conf = this->private;
- uuid_copy (rsp.uuid, conf->uuid);
+ uuid_copy (rsp.uuid, MY_UUID);
rsp.hostname = hostname;
rsp.port = port;
ret = glusterd_submit_reply (req, &rsp, NULL, 0, NULL,
@@ -2369,7 +2369,7 @@ glusterd_xfer_friend_add_resp (rpcsvc_request_t *req, char *hostname, int port,
conf = this->private;
- uuid_copy (rsp.uuid, conf->uuid);
+ uuid_copy (rsp.uuid, MY_UUID);
rsp.op_ret = op_ret;
rsp.op_errno = op_errno;
rsp.hostname = gf_strdup (hostname);
@@ -2900,7 +2900,7 @@ glusterd_peer_rpc_notify (struct rpc_clnt *rpc, void *mydata,
if (peerinfo->connected) {
glusterd_get_lock_owner (&owner);
- if (!uuid_compare (conf->uuid, owner)) {
+ if (!uuid_compare (MY_UUID, owner)) {
ret = glusterd_op_sm_inject_event
(GD_OP_EVENT_START_UNLOCK, NULL);
if (ret)