Always use blocking lock for VGs and orphan locks.
PATCH 1/1 Always use blocking lock for VGs and orphan locks.
Because we have now strong rule for lock ordering:
- VG locks must be taken in alphabetical order
- ORPHAN locks must be the lastvgs_locked() is now not needed.
This fixes problem with orphan locking, e.g.
vgremove VG1 | vgremove VG2 lock(VG1) | lock(VG2) lock(ORPHAN) | lock(ORPHAN) -> fail, non-blocking
https://bugzilla.redhat.com/show_bug.cgi?id=578413
(More similar places in code.)
Signed-off-by Milan Broz <[email protected]>
--- lib/locking/locking.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-)
lib/locking/locking.c +2 -4
@@ -420,11 +420,9 @@ int lock_vol(struct cmd_context *cmd, const char *vol, uint32_t flags)switch (flags &LCK_SCOPE_MASK ) {case LCK_VG :/* -* Automatically set LCK_NONBLOCK if one or more VGs locked. -* This will enforce correctness and prevent deadlocks rather -* than relying on the caller to set the flag properly. +* VG locks alphabetical, ORPHAN lock last */ -if (!_blocking_supported ||vgs_locked ()) +if (!_blocking_supported) flags |=LCK_NONBLOCK ; if (vol[0] != '#' &&
Signature · 1 line
1.7.0.3
PATCH 1/1 Always use blocking lock for VGs and orphan locks.
Quoted 9 lines · Milan Broz
Because we have now strong rule for lock ordering:
- VG locks must be taken in alphabetical order
- ORPHAN locks must be the lastvgs_locked()is now not needed.
This fixes problem with orphan locking, e.g.vgremove VG1 | vgremove VG2 lock(VG1) | lock(VG2) lock(ORPHAN) | lock(ORPHAN) -> fail, non-blocking
Ack.
Alasdair