From fbdbe06a1df2f983f2ec7a3103db932f40653650 Mon Sep 17 00:00:00 2001 From: Kaushal M Date: Tue, 30 Apr 2013 13:03:08 +0530 Subject: glusterd-volgen: Improve volume op-versions calculation Backport of patch on master branch, under review at http://review.gluster.org/4952 Volume op-versions calculations now take into account if an option, a. enables/disables an xlator, or b. is a boolean option. This prevents op-versions from being updated when a feature is disabled. BUG: 954256 Change-Id: Ic68032b9e55a3f0191f8fc3ecd6b5ced385ad943 Signed-off-by: Kaushal M Reviewed-on: http://review.gluster.org/5094 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- libglusterfs/src/options.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libglusterfs/src/options.c') diff --git a/libglusterfs/src/options.c b/libglusterfs/src/options.c index 5d436bab3..842b6413a 100644 --- a/libglusterfs/src/options.c +++ b/libglusterfs/src/options.c @@ -761,7 +761,7 @@ out: } -static volume_option_t * +volume_option_t * xlator_volume_option_get_list (volume_opt_list_t *vol_list, const char *key) { volume_option_t *opt = NULL; @@ -1098,7 +1098,6 @@ pc_or_size (char *in, double *out) return ret; } - DEFINE_INIT_OPT(char *, str, pass); DEFINE_INIT_OPT(uint64_t, uint64, gf_string2uint64); DEFINE_INIT_OPT(int64_t, int64, gf_string2int64); -- cgit