Patchwork [BUG:3003,1/1] mgmt/glusterd: Set the generic options in the graph before merging it with the parent graph while building nfs-server volfile.

login
register
Submitter Mohammed Junaid Ahmed
Date 2011-06-14 09:14:30
Message ID <1308042870-30323-1-git-send-email-junaid@gluster.com>
Download mbox | patch
Permalink /patch/7476/
State Accepted
Headers show

Comments

Mohammed Junaid Ahmed - 2011-06-14 09:14:30
From: Junaid <junaid@gluster.com>


Signed-off-by: Junaid <junaid@gluster.com>
---
 xlators/mgmt/glusterd/src/glusterd-volgen.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

Patch

diff --git a/xlators/mgmt/glusterd/src/glusterd-volgen.c b/xlators/mgmt/glusterd/src/glusterd-volgen.c
index 6d09c7d..a090f46 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: