shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

cleanup: clvmd move destroy_lvhash into main

Browse Source 
Keep destruction code path consistent and simple and
destroy lvhash in the place it's been created.
Also issue debug message from a single place.
This commit is contained in:
Zdenek Kabelac 2014-03-20 14:06:16 +01:00
parent 1ee8688de0
commit bf19c6be2c
5 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
daemons/clvmd/clvmd-cman.c
View File

@ -245,7 +245,6 @@ static void _add_up_node(const char *csid)
static void _cluster_closedown() static void _cluster_closedown()
{ {
destroy_lvhash();
dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1); dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
cman_finish(c_handle); cman_finish(c_handle);
} }

3
daemons/clvmd/clvmd-corosync.c
View File

@ -345,9 +345,6 @@ static int _init_cluster(void)
static void _cluster_closedown(void) static void _cluster_closedown(void)
{ {
DEBUGLOG("cluster_closedown\n");
destroy_lvhash();
dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1); dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
cpg_finalize(cpg_handle); cpg_finalize(cpg_handle);
quorum_finalize(quorum_handle); quorum_finalize(quorum_handle);

3
daemons/clvmd/clvmd-openais.c
View File

@ -365,9 +365,6 @@ static int _init_cluster(void)
static void _cluster_closedown(void) static void _cluster_closedown(void)
{ {
DEBUGLOG("cluster_closedown\n");
destroy_lvhash();
saLckFinalize(lck_handle); saLckFinalize(lck_handle);
cpg_finalize(cpg_handle); cpg_finalize(cpg_handle);
} }

2
daemons/clvmd/clvmd-singlenode.c
View File

@ -121,8 +121,6 @@ static void _cluster_closedown(void)
{ {
close_comms(); close_comms();
DEBUGLOG("cluster_closedown\n");
destroy_lvhash();
/* If there is any awaited resource, kill it softly */ /* If there is any awaited resource, kill it softly */
pthread_mutex_lock(&_lock_mutex); pthread_mutex_lock(&_lock_mutex);
dm_hash_destroy(_locks); dm_hash_destroy(_locks);

2
daemons/clvmd/clvmd.c
View File

@ -636,6 +636,8 @@ int main(int argc, char *argv[])
dm_free(delfd); dm_free(delfd);
} }
DEBUGLOG("cluster_closedown\n");
destroy_lvhash();
clops->cluster_closedown(); clops->cluster_closedown();
ret = 0; ret = 0;