diff options
| author | Mohammed Rafi KC <rkavunga@redhat.com> | 2019-06-24 15:49:04 +0530 |
|---|---|---|
| committer | Rinku Kothiya <rkothiya@redhat.com> | 2019-07-24 10:23:18 +0000 |
| commit | b2531751a186e31d8c0ca3f7e3e44475294931b6 (patch) | |
| tree | 73615c5daeb7295977cac7614b0705792f4031a8 /libglusterfs | |
| parent | e69bc0a183d9cbbace0bc36de87707fc059f2c35 (diff) | |
graph/shd: Use glusterfs_graph_deactivate to free the xl rec
We were using glusterfs_graph_fini to free the xl rec from
glusterfs_process_volfp as well as glusterfs_graph_cleanup.
Instead we can use glusterfs_graph_deactivate, which is does
fini as well as other common rec free.
Backportof : https://review.gluster.org/22904
>Change-Id: Ie4a5f2771e5254aa5ed9f00c3672a6d2cc8e4bc1
>Updates: bz#1716695
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Change-Id: Ie4a5f2771e5254aa5ed9f00c3672a6d2cc8e4bc1
Updates: bz#1730229
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
Diffstat (limited to 'libglusterfs')
| -rw-r--r-- | libglusterfs/src/graph.c | 2 | ||||
| -rw-r--r-- | libglusterfs/src/xlator.c | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libglusterfs/src/graph.c b/libglusterfs/src/graph.c index cb1c0017cf1..aea74a5edad 100644 --- a/libglusterfs/src/graph.c +++ b/libglusterfs/src/graph.c @@ -1401,7 +1401,7 @@ glusterfs_graph_cleanup(void *arg) pthread_mutex_lock(&ctx->cleanup_lock); { - glusterfs_graph_fini(graph); + glusterfs_graph_deactivate(graph); glusterfs_graph_destroy(graph); } pthread_mutex_unlock(&ctx->cleanup_lock); diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c index 8df45beb9a3..9906809f7aa 100644 --- a/libglusterfs/src/xlator.c +++ b/libglusterfs/src/xlator.c @@ -659,6 +659,7 @@ xlator_fini_rec(xlator_t *xl) trav = trav->next; } + xl->cleanup_starting = 1; if (xl->init_succeeded) { if (xl->fini) { old_THIS = THIS; @@ -666,8 +667,14 @@ xlator_fini_rec(xlator_t *xl) xl->fini(xl); - if (xl->local_pool) + if (xl->local_pool) { mem_pool_destroy(xl->local_pool); + xl->local_pool = NULL; + } + if (xl->itable) { + inode_table_destroy(xl->itable); + xl->itable = NULL; + } THIS = old_THIS; } else { |