summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2016-01-15 15:31:13 -0600
committerDavid Teigland <teigland@redhat.com>2016-01-18 09:35:20 -0600
commit95ead96004c303f4285acfc223bba58e82e3ee87 (patch)
tree7a9ff8396fbe6d49cde2e424ca9528aeb98e062c
parent54b41dcd53d99059b691f72eb6e7556d4341634d (diff)
downloadlvm2-95ead96004c303f4285acfc223bba58e82e3ee87.tar.gz
lvmlockd: fix lvb validation for conversion
Make the lvb validation rules for convert match those for unlock (even though it would be very unlikely or impossible for convert to deal with zero lvb.)
-rw-r--r--daemons/lvmlockd/lvmlockd-core.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c
index 093021de5..53fc0d5c7 100644
--- a/daemons/lvmlockd/lvmlockd-core.c
+++ b/daemons/lvmlockd/lvmlockd-core.c
@@ -1379,12 +1379,16 @@ static int res_convert(struct lockspace *ls, struct resource *r,
r->version++;
lk->version = r->version;
r_version = r->version;
+ r->version_zero_valid = 0;
+
log_debug("S %s R %s res_convert r_version inc %u",
ls->name, r->name, r_version);
} else if ((r->type == LD_RT_VG) && (r->mode == LD_LK_EX) && (lk->version > r->version)) {
r->version = lk->version;
r_version = r->version;
+ r->version_zero_valid = 0;
+
log_debug("S %s R %s res_convert r_version new %u", ls->name, r->name, r_version);
} else {
r_version = 0;