From 185ac73d1892f6cdaada1f3f0258c41d7d6ef3f0 Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 1 Jul 2010 21:23:47 +0000 Subject: [PATCH] Remove superfluous suspended device counter from clvmd. Moreover, in current mirror handling, when it calls activate on removed but suspended detached log this counter drops below zero and confuses debug log. --- WHATS_NEW | 1 + daemons/clvmd/lvm-functions.c | 7 +------ 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/WHATS_NEW b/WHATS_NEW index 78a34ad55..b6b983142 100644 --- a/WHATS_NEW +++ b/WHATS_NEW @@ -1,5 +1,6 @@ Version 2.02.70 - ================================ + Remove superfluous suspended device counter from clvmd. Fix lvm shell crash when input is entirely whitespace. Update partial mode warning message. Preserve memlock balance in clvmd when activation triggers a resume. diff --git a/daemons/clvmd/lvm-functions.c b/daemons/clvmd/lvm-functions.c index 257e29c6e..e7db6852c 100644 --- a/daemons/clvmd/lvm-functions.c +++ b/daemons/clvmd/lvm-functions.c @@ -38,7 +38,6 @@ static struct dm_hash_table *lv_hash = NULL; static pthread_mutex_t lv_hash_lock; static pthread_mutex_t lvm_lock; static char last_error[1024]; -static int suspended = 0; struct lv_info { int lock_id; @@ -498,15 +497,11 @@ int do_lock_lv(unsigned char command, unsigned char lock_flags, char *resource) case LCK_LV_SUSPEND: status = do_suspend_lv(resource, lock_flags); - if (!status) - suspended++; break; case LCK_UNLOCK: case LCK_LV_RESUME: /* if active */ status = do_resume_lv(resource, lock_flags); - if (!status) - suspended--; break; case LCK_LV_ACTIVATE: @@ -844,7 +839,7 @@ void lvm_do_backup(const char *vgname) struct volume_group * vg; int consistent = 0; - DEBUGLOG("Triggering backup of VG metadata for %s. suspended=%d\n", vgname, suspended); + DEBUGLOG("Triggering backup of VG metadata for %s.\n", vgname); pthread_mutex_lock(&lvm_lock); -- 2.43.5