From 83990996736c72f3131f66df35ea7bf2b3d3b5fa Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Wed, 16 Aug 2017 20:17:19 +0530 Subject: libglusterfs: Add new fields to volume_options struct The new fields are required to enable equivalent volume set and volgen features, and some more additional features in GD2. GD2 does not use a hard-coded volume options map like GD1, but builds such by reading the options tables directly from the xlators. The new fields being introduced into the volume options struct include the following, - op-version - version(s) the option was introduced in - deprecated - version(s) the option was deprecated in - flags - flags for the option (settable, client, global, force, doc etc.) - tags - descriptive tags that apply to this option, can be used to group options - validate_fn - custom option validation function Enums for currently available flags have also been defined. To avoid a naming clashes, the flag enums in GD1 have been renamed. Updates #302 Change-Id: Ic7e08aef9e051beb47e8dc17d7f7be211aed308a Signed-off-by: Kaushal M Reviewed-on: https://review.gluster.org/18059 Smoke: Gluster Build System CentOS-regression: Gluster Build System Reviewed-by: Amar Tumballi --- xlators/mgmt/glusterd/src/glusterd-volgen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-volgen.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index b261889407c..e14e3133679 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -6712,7 +6712,7 @@ gd_is_client_option (char *key) GF_ASSERT (key); vmep = _gd_get_vmep (key); - if (vmep && (vmep->flags & OPT_FLAG_CLIENT_OPT)) + if (vmep && (vmep->flags & VOLOPT_FLAG_CLIENT_OPT)) return _gf_true; return _gf_false; @@ -6726,7 +6726,7 @@ gd_is_xlator_option (char *key) GF_ASSERT (key); vmep = _gd_get_vmep (key); - if (vmep && (vmep->flags & OPT_FLAG_XLATOR_OPT)) + if (vmep && (vmep->flags & VOLOPT_FLAG_XLATOR_OPT)) return _gf_true; return _gf_false; -- cgit