diff options
| author | David Teigland <teigland@redhat.com> | 2016-01-28 09:42:45 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2016-01-28 09:42:45 -0600 |
| commit | 762b0d697ff7456d0a450121e41eff00cd5a7f08 (patch) | |
| tree | 7344338cd3be764830fd7138630600daa32c9f45 | |
| parent | 0ad40a76c0603147f9b945f7492ad721e7f95edb (diff) | |
| download | lvm2-762b0d697ff7456d0a450121e41eff00cd5a7f08.tar.gz | |
lvmlockd: don't adopt locks from unused lm
When built without dlm or sanlock support, don't
attempt to adopt locks from that lm.
| -rw-r--r-- | daemons/lvmlockd/lvmlockd-core.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c index 4cd3284ee..292d19cc4 100644 --- a/daemons/lvmlockd/lvmlockd-core.c +++ b/daemons/lvmlockd/lvmlockd-core.c @@ -5153,13 +5153,17 @@ static void adopt_locks(void) * This is expected for at least one of them. */ - rv = lm_get_lockspaces_dlm(&ls_found); - if ((rv < 0) && (rv != -ECONNREFUSED)) - goto fail; + if (lm_support_dlm()) { + rv = lm_get_lockspaces_dlm(&ls_found); + if ((rv < 0) && (rv != -ECONNREFUSED)) + goto fail; + } - rv = lm_get_lockspaces_sanlock(&ls_found); - if ((rv < 0) && (rv != -ECONNREFUSED)) - goto fail; + if (lm_support_sanlock()) { + rv = lm_get_lockspaces_sanlock(&ls_found); + if ((rv < 0) && (rv != -ECONNREFUSED)) + goto fail; + } if (list_empty(&ls_found)) { log_debug("No lockspaces found to adopt"); |