mirror of
git://sourceware.org/git/lvm2.git
synced 2025-01-03 05:18:29 +03:00
lvmlockd: cleanup after sanlock_rem_lockspace error
When storage is lost under a sanlock VG, and kill_vg/drop_vg are used, sanlock_rem_lockspace() may return an error, but the cleanup steps should still be performed. Without the cleanup, gl_lsname_sanlock was not cleared. This caused future lock requests to fail with ENOLS, but the NO_GL_LS flag was not set due to gl_lsname_sanlock being set. This caused lockd_global(sh) in lvm commands to fail when they could succeed. Fix from guozhonghua216
This commit is contained in:
parent
04fbffb116
commit
42a16aa6f3
@ -1576,10 +1576,8 @@ int lm_rem_lockspace_sanlock(struct lockspace *ls, int free_vg)
|
||||
goto out;
|
||||
|
||||
rv = sanlock_rem_lockspace(&lms->ss, 0);
|
||||
if (rv < 0) {
|
||||
if (rv < 0)
|
||||
log_error("S %s rem_lockspace_san error %d", ls->name, rv);
|
||||
return rv;
|
||||
}
|
||||
|
||||
if (free_vg) {
|
||||
/*
|
||||
|
Loading…
Reference in New Issue
Block a user