1
0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00

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.
This commit is contained in:
Milan Broz 2010-07-01 21:23:47 +00:00
parent 89dd7d5275
commit 185ac73d18
2 changed files with 2 additions and 6 deletions

View File

@ -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.

View File

@ -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);