Marcus Meissner
f45a4f9a5e
forward-port several patches from sle11sp3.bnc#831518 OBS-URL: https://build.opensuse.org/request/show/227422 OBS-URL: https://build.opensuse.org/package/show/Base:System/lvm2?expand=0&rev=85
35 lines
1.1 KiB
Diff
35 lines
1.1 KiB
Diff
Index: LVM2.2.02.98/daemons/clvmd/lvm-functions.c
|
|
===================================================================
|
|
--- LVM2.2.02.98.orig/daemons/clvmd/lvm-functions.c
|
|
+++ LVM2.2.02.98/daemons/clvmd/lvm-functions.c
|
|
@@ -418,11 +418,13 @@ static int do_resume_lv(char *resource,
|
|
int oldmode, origin_only, exclusive, revert;
|
|
|
|
/* Is it open ? */
|
|
+ /*
|
|
oldmode = get_current_lock(resource);
|
|
if (oldmode == -1 && (command & LCK_CLUSTER_VG)) {
|
|
DEBUGLOG("do_resume_lv, lock not already held\n");
|
|
- return 0; /* We don't need to do anything */
|
|
+ return 0;
|
|
}
|
|
+ */
|
|
origin_only = (lock_flags & LCK_ORIGIN_ONLY_MODE) ? 1 : 0;
|
|
exclusive = (oldmode == LCK_EXCL) ? 1 : 0;
|
|
revert = (lock_flags & LCK_REVERT_MODE) ? 1 : 0;
|
|
@@ -442,11 +444,13 @@ static int do_suspend_lv(char *resource,
|
|
unsigned exclusive;
|
|
|
|
/* Is it open ? */
|
|
+ /*
|
|
oldmode = get_current_lock(resource);
|
|
if (oldmode == -1 && (command & LCK_CLUSTER_VG)) {
|
|
DEBUGLOG("do_suspend_lv, lock not already held\n");
|
|
- return 0; /* Not active, so it's OK */
|
|
+ return 0;
|
|
}
|
|
+ */
|
|
|
|
exclusive = (oldmode == LCK_EXCL) ? 1 : 0;
|
|
|