summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt
diff options
context:
space:
mode:
authorAtin Mukherjee <amukherj@redhat.com>2015-11-19 12:00:23 +0530
committerAtin Mukherjee <amukherj@redhat.com>2015-12-27 21:36:49 -0800
commit15965dd310192cae8f05fddda309e77ff5c72ca2 (patch)
treed211ccc67501060953a40adad150264209f5d816 /xlators/mgmt
parent4ec0e36fff703d156c52bada758b97eff86ce61c (diff)
core : Use correct path in dlopen for socket.so
Backport of http://review.gluster.org/12656 This patch fixes the path for socket.so file while loading the so dynamically. Also for config.memory-accounting & config.transport voltype is changed to glusterd to fix the warning message coming from xlator_volopt_dynload Change-Id: I0f7964814586f2018d4922b23c683f4e1eb3098e BUG: 1283833 Signed-off-by: Atin Mukherjee <amukherj@redhat.com> Reviewed-on: http://review.gluster.org/12656 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Niels de Vos <ndevos@redhat.com> Reviewed-by: Jeff Darcy <jdarcy@redhat.com> Reviewed-on: http://review.gluster.org/12670 Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'xlators/mgmt')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volume-set.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 54b24d87e70..ff89979ff3f 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -2166,13 +2166,13 @@ struct volopt_map_entry glusterd_volopt_map[] = {
.op_version = 3
},
{ .key = "config.memory-accounting",
- .voltype = "configuration",
+ .voltype = "mgmt/glusterd",
.option = "!config",
.op_version = 2,
.flags = OPT_FLAG_CLIENT_OPT
},
{ .key = "config.transport",
- .voltype = "configuration",
+ .voltype = "mgmt/glusterd",
.option = "!config",
.op_version = 2
},