From 821854b5e832539e6bddb2db7d8b0c67e4df79cd Mon Sep 17 00:00:00 2001 From: Junaid Date: Mon, 13 Jun 2011 00:51:38 +0000 Subject: mgmt/glusterd: Set the generic options in the graph before merging it with the parent graph while building nfs-server volfile. Signed-off-by: Junaid Signed-off-by: Anand Avati BUG: 3003 (Modification of one of the options of volume is reflected in all the volumes in the nfs-server-volfile) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=3003 --- xlators/mgmt/glusterd/src/glusterd-volgen.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c index 89a6f8dbbe5..0a20eee000f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -1673,21 +1673,21 @@ build_nfs_graph (glusterfs_graph_t *graph, dict_t *mod_dict) memset (&cgraph, 0, sizeof (cgraph)); ret = build_client_graph (&cgraph, voliter, mod_dict); - if (ret) - goto out;; - ret = volgen_graph_merge_sub (graph, &cgraph); if (ret) goto out; if (mod_dict) { dict_copy (mod_dict, set_dict); - ret = volgen_graph_set_options_generic (graph, set_dict, voliter, - nfs_spec_option_handler); + ret = volgen_graph_set_options_generic (&cgraph, set_dict, voliter, + nfs_spec_option_handler); + } else { + ret = volgen_graph_set_options_generic (&cgraph, voliter->dict, voliter, + nfs_spec_option_handler); } - else - ret = volgen_graph_set_options_generic (graph, voliter->dict, voliter, - nfs_spec_option_handler); + ret = volgen_graph_merge_sub (graph, &cgraph); + if (ret) + goto out; } -- cgit