From 953f89d82f2c444719ba3150c9890c072a2e7fb3 Mon Sep 17 00:00:00 2001 From: Pranith K Date: Thu, 16 Dec 2010 01:24:33 +0000 Subject: glusterd,cli: print single error message on failure Signed-off-by: Pranith Kumar K Signed-off-by: Anand V. Avati BUG: 1922 (Volume not present wrong message displayed on command line) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=1922 --- libglusterfs/src/xlator.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libglusterfs/src') diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c index dcdf40f7120..67ee3287402 100644 --- a/libglusterfs/src/xlator.c +++ b/libglusterfs/src/xlator.c @@ -993,7 +993,7 @@ int xlator_validate_rec (xlator_t *xlator, char **op_errstr) { xlator_list_t *trav = NULL; - + if (xlator == NULL ) { gf_log ("xlator", GF_LOG_DEBUG, "invalid argument"); return -1; @@ -1007,27 +1007,27 @@ xlator_validate_rec (xlator_t *xlator, char **op_errstr) trav = trav->next; } - + if (xlator_dynload (xlator)) gf_log ("", GF_LOG_DEBUG, "Did not load the symbols"); if (xlator->validate_options) { - if (xlator->validate_options (xlator, xlator->options, + if (xlator->validate_options (xlator, xlator->options, op_errstr)) { gf_log ("", GF_LOG_DEBUG, *op_errstr); return -1; } gf_log (xlator->name, GF_LOG_DEBUG, "Validated option"); - + } - + gf_log (xlator->name, GF_LOG_DEBUG, "No validate_options() found"); return 0; } int -graph_reconf_validateopt (glusterfs_graph_t *graph, +graph_reconf_validateopt (glusterfs_graph_t *graph, char **op_errstr) { xlator_t *xlator = NULL; -- cgit