summaryrefslogtreecommitdiffstats
path: root/libglusterfs/src/graph.c
diff options
context:
space:
mode:
authorAnoop C S <achiraya@redhat.com>2014-10-29 09:12:46 -0400
committerNiels de Vos <ndevos@redhat.com>2014-12-08 01:54:45 -0800
commitcd6ffa93dc2a3cb1fcc5438086aebc54f368c2e9 (patch)
treef7015ad650eea8557aadef3ac703c44aae8fb5b8 /libglusterfs/src/graph.c
parent92a293220117f896bfcc1950dabd5bb1bfae9965 (diff)
libgfapi: Wait for GF_EVENT_CHILD_DOWN in glfs_fini()
Whenever glfs_fini() is being called, currently no check is made inside the function to determine whether the child is already down or not. This patch will wait for GF_EVENT_CHILD_DOWN for the active subvol and then exits. TBD: Apart from the active subvol, wait for other CHILD_DOWN events generated through operations like volume set in future. Change-Id: I81c64ac07b463bfed48bf306f9e8f46ba0f0a76f BUG: 1153610 Signed-off-by: Anoop C S <achiraya@redhat.com> Reviewed-on: http://review.gluster.org/9060 Reviewed-by: Shyamsundar Ranganathan <srangana@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'libglusterfs/src/graph.c')
-rw-r--r--libglusterfs/src/graph.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libglusterfs/src/graph.c b/libglusterfs/src/graph.c
index 52e79ab68cd..f6db5557a33 100644
--- a/libglusterfs/src/graph.c
+++ b/libglusterfs/src/graph.c
@@ -765,12 +765,12 @@ glusterfs_graph_reconfigure (glusterfs_graph_t *oldgraph,
int
glusterfs_graph_destroy (glusterfs_graph_t *graph)
{
- xlator_tree_free (graph->first);
+ GF_VALIDATE_OR_GOTO ("graph", graph, out);
- if (graph) {
- list_del_init (&graph->list);
- GF_FREE (graph);
- }
+ xlator_tree_free (graph->first);
+ list_del_init (&graph->list);
+ GF_FREE (graph);
+out:
return 0;
}