summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunaid <junaid@gluster.com>2011-06-14 03:44:30 +0000
committerAnand Avati <avati@gluster.com>2011-06-14 02:38:22 -0700
commita383d5b22aae9837f5609f304ee0488bcf8bafba (patch)
tree15702df330729f0d090c7170e696222d65033f3b
parent4a95dd213c039834c958bc1e3845037aa87fcde2 (diff)
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 <junaid@gluster.com> Signed-off-by: Anand Avati <avati@gluster.com> 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
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-volgen.c16
1 files changed, 8 insertions, 8 deletions
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: