d1681e
From 48201511990f4677e634f236bb81ad03a23fc52a Mon Sep 17 00:00:00 2001
d1681e
From: Jiffin Tony Thottan <jthottan@redhat.com>
d1681e
Date: Tue, 27 Feb 2018 15:35:30 +0530
d1681e
Subject: [PATCH 167/180] glusterd/ganesha : change voltype for ganesha.enable
d1681e
 in volume option table
d1681e
d1681e
The voltype defined for ganesha.enable is features/ganesha. But ganesha xlator
d1681e
was removed from client stack long back. Now it is defined as part of glusterd.
d1681e
So reflecting the same on the volume option table.
d1681e
d1681e
Label: BACKPORT FROM UPSTREAM 3.10
d1681e
d1681e
Upstream reference :
d1681e
>patch link https://review.gluster.org/19639
d1681e
>Change-Id: Ifedd7493020b77bd54edfdbdd9c799d93b24d0aa
d1681e
>BUG: 1486542
d1681e
>Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
d1681e
d1681e
Change-Id: Ifedd7493020b77bd54edfdbdd9c799d93b24d0aa
d1681e
BUG: 1378371
d1681e
Signed-off-by: Jiffin Tony Thottan <jthottan@redhat.com>
d1681e
Reviewed-on: https://code.engineering.redhat.com/gerrit/131343
d1681e
Tested-by: RHGS Build Bot <nigelb@redhat.com>
d1681e
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
d1681e
---
d1681e
 xlators/mgmt/glusterd/src/glusterd-volume-set.c | 2 +-
d1681e
 1 file changed, 1 insertion(+), 1 deletion(-)
d1681e
d1681e
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
d1681e
index af0a982..b603c7f 100644
d1681e
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
d1681e
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
d1681e
@@ -3232,7 +3232,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
d1681e
           .flags      = OPT_FLAG_CLIENT_OPT
d1681e
         },
d1681e
         { .key         = "ganesha.enable",
d1681e
-          .voltype     = "features/ganesha",
d1681e
+          .voltype     = "mgmt/glusterd",
d1681e
           .value       = "off",
d1681e
           .option      = "ganesha.enable",
d1681e
           .op_version  = GD_OP_VERSION_3_7_0,
d1681e
-- 
d1681e
1.8.3.1
d1681e