summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2015-11-09 11:33:16 -0600
committerDavid Teigland <teigland@redhat.com>2015-11-09 11:33:16 -0600
commit6762eec88c0b9ee85ab77423b41bb0e8b9b0d67d (patch)
treeef2f7767c47f110cd3c16bf4846ac3fa9d5e936e
parent45e749493c55ec349abfe9670cb46c6a70528ae4 (diff)
downloadlvm2-6762eec88c0b9ee85ab77423b41bb0e8b9b0d67d.tar.gz
lvmlockd: fix the NO_GL_LS condition
indicating when no global lockspace exists.
-rw-r--r--daemons/lvmlockd/lvmlockd-core.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c
index b4be116db..c39f802d9 100644
--- a/daemons/lvmlockd/lvmlockd-core.c
+++ b/daemons/lvmlockd/lvmlockd-core.c
@@ -3594,10 +3594,15 @@ static int client_send_result(struct client *cl, struct action *act)
strcat(result_flags, "NO_LOCKSPACES,");
pthread_mutex_unlock(&lockspaces_mutex);
- if (gl_use_sanlock && !gl_lsname_sanlock[0])
- strcat(result_flags, "NO_GL_LS,");
- else
+ if (gl_use_sanlock) {
+ if (!gl_lsname_sanlock[0])
+ strcat(result_flags, "NO_GL_LS,");
+ } else if (gl_use_dlm) {
+ if (!gl_lsname_dlm[0])
+ strcat(result_flags, "NO_GL_LS,");
+ } else {
strcat(result_flags, "NO_GL_LS,");
+ }
}
if (act->flags & LD_AF_DUP_GL_LS)