Skip to contentSkip to conversation

clvmd tidy lock use

PATCH New Milan Broz 2 participants 2 messages Apr 10, 2009 – Apr 20, 2009

lore
Share & tools
lore

Milan Broz

author
#0 lore raw

PATCH 1/1 clvmd tidy lock use

Tidy lv_hash[_lock] use inside clvmd.

- Rename unlock_all to destroy_lvhash,
this function is called in cluster shutdown unlocks everything and clean up allocated info space.

- Tidy lv_hash_lock use

Except adding free(lvi) in lv_has destructror
there is no functional change.

---
 daemons/clvmd/clvmd-cman.c     |    2 +-
 daemons/clvmd/clvmd-corosync.c |    2 +-
 daemons/clvmd/clvmd-gulm.c     |    2 +-
 daemons/clvmd/clvmd-openais.c  |    2 +-
 daemons/clvmd/lvm-functions.c  |   95 ++++++++++++++++++++++++++--------------
 daemons/clvmd/lvm-functions.h  |    2 +-
 6 files changed, 67 insertions(+), 38 deletions(-)
daemons/clvmd/clvmd-cman.c +1 -1
index a853b3b..dec6331 100644
@@ -263,7 +263,7 @@ static void _add_up_node(const char *csid)
 
 static void _cluster_closedown()
 {
-	unlock_all();
+	destroy_lvhash();
 	dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
 	cman_finish(c_handle);
 }
daemons/clvmd/clvmd-corosync.c +1 -1
index 4062291..ee90641 100644
@@ -359,7 +359,7 @@ static int _init_cluster(void)
 static void _cluster_closedown(void)
 {
 	DEBUGLOG("cluster_closedown\n");
-	unlock_all();
+	destroy_lvhash();
 
 	dlm_release_lockspace(LOCKSPACE_NAME, lockspace, 1);
 	cpg_finalize(cpg_handle);
daemons/clvmd/clvmd-gulm.c +1 -1
index 5d4d3a7..4bb1b65 100644
@@ -248,7 +248,7 @@ static void _cluster_closedown(void)
 {
     DEBUGLOG("cluster_closedown\n");
     in_shutdown = 1;
-    unlock_all();
+    destroy_lvhash();
     lg_lock_logout(gulm_if);
     lg_core_logout(gulm_if);
     lg_release(gulm_if);
daemons/clvmd/clvmd-openais.c +1 -1
index 58da43a..3101069 100644
@@ -382,7 +382,7 @@ static int _init_cluster(void)
 static void _cluster_closedown(void)
 {
 	DEBUGLOG("cluster_closedown\n");
-	unlock_all();
+	destroy_lvhash();
 
 	saLckFinalize(lck_handle);
 	cpg_finalize(cpg_handle);
daemons/clvmd/lvm-functions.c +62 -33

148 lines not on this page · raw message

daemons/clvmd/lvm-functions.h +1 -1
index bf42dbe..0b6866a 100644
@@ -28,10 +28,10 @@ extern int do_check_lvm1(const char *vgname);
 extern int do_refresh_cache(void);
 extern int init_lvm(int using_gulm);
 extern void init_lvhash(void);
+extern void destroy_lvhash(void);
 extern void lvm_do_backup(const char *vgname);
 extern int hold_unlock(char *resource);
 extern int hold_lock(char *resource, int mode, int flags);
-extern void unlock_all(void);
 extern char *get_last_lvm_error(void);
 extern void drop_metadata(const char *vgname);
 
#1 lore raw

PATCH 1/1 clvmd tidy lock use

Quoted 1 line · Milan Broz

Tidy lv_hash[_lock] use inside clvmd.

Ack.

Alasdair

Signature · 1 line
agk at redhat.com