shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

lvmlockd: don't adopt locks from unused lm

Browse Source 
When built without dlm or sanlock support, don't
attempt to adopt locks from that lm.
This commit is contained in:
David Teigland 2016-01-28 09:42:45 -06:00
parent 0ad40a76c0
commit 762b0d697f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
daemons/lvmlockd/lvmlockd-core.c
View File

@ -5153,13 +5153,17 @@ static void adopt_locks(void)
* This is expected for at least one of them. * This is expected for at least one of them.
*/ */
rv = lm_get_lockspaces_dlm(&ls_found); if (lm_support_dlm()) {
if ((rv < 0) && (rv != -ECONNREFUSED)) rv = lm_get_lockspaces_dlm(&ls_found);
goto fail; if ((rv < 0) && (rv != -ECONNREFUSED))
goto fail;
}
rv = lm_get_lockspaces_sanlock(&ls_found); if (lm_support_sanlock()) {
if ((rv < 0) && (rv != -ECONNREFUSED)) rv = lm_get_lockspaces_sanlock(&ls_found);
goto fail; if ((rv < 0) && (rv != -ECONNREFUSED))
goto fail;
}
if (list_empty(&ls_found)) { if (list_empty(&ls_found)) {
log_debug("No lockspaces found to adopt"); log_debug("No lockspaces found to adopt");