From a383d5b22aae9837f5609f304ee0488bcf8bafba Mon Sep 17 00:00:00 2001 From: Junaid Date: Tue, 14 Jun 2011 03:44:30 +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(-) (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 6d09c7d2a0c..a090f46debd 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -1931,19 +1931,19 @@ build_nfs_graph (volgen_graph_t *graph, dict_t *mod_dict) ret = build_client_graph (&cgraph, voliter, set_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; } out: -- cgit