diff options
| author | Junaid <junaid@gluster.com> | 2011-06-13 00:51:38 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-06-16 09:16:10 -0700 |
| commit | 821854b5e832539e6bddb2db7d8b0c67e4df79cd (patch) | |
| tree | dbc80f3b0460165e99226dfb516c896c2ff12398 | |
| parent | 0d48ebc16853a079f46ce58e1d09e9bd104ee2a6 (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.c | 16 |
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 89a6f8dbbe5..0a20eee000f 100644 --- a/xlators/mgmt/glusterd/src/glusterd-volgen.c +++ b/xlators/mgmt/glusterd/src/glusterd-volgen.c @@ -1674,20 +1674,20 @@ 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; } |