This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
The tag: cmirror_1_1_24 has been created
- From: Chris Feist <cfeist at fedoraproject dot org>
- To: cluster-cvs-relay at redhat dot com
- Date: Wed, 17 Sep 2008 21:38:17 +0000 (UTC)
- Subject: The tag: cmirror_1_1_24 has been created
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=7967567982877f3896305e3fe3c45b64c1cac842
Commit: 7967567982877f3896305e3fe3c45b64c1cac842
Parent: ca601c31a6e2d044f435c872abf9fc4f24ddb965
Author: David Teigland <teigland@redhat.com>
AuthorDate: Wed Sep 17 14:52:38 2008 -0500
Committer: David Teigland <teigland@redhat.com>
CommitterDate: Wed Sep 17 14:52:38 2008 -0500
dlm_controld: ignore old plock dev when using new one
Don't require /dev/misc/lock_dlm_plock to exist when we've
found /dev/misc/dlm_plock.
Signed-off-by: David Teigland <teigland@redhat.com>
---
fence/fence_tool/fence_tool.c | 2 ++
group/dlm_controld/action.c | 7 ++++++-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/fence/fence_tool/fence_tool.c b/fence/fence_tool/fence_tool.c
index 4c5875a..7a91ff7 100644
--- a/fence/fence_tool/fence_tool.c
+++ b/fence/fence_tool/fence_tool.c
@@ -434,9 +434,11 @@ static int do_list(void)
np++;
}
printf("\n");
+ printf("\n");
exit(EXIT_SUCCESS);
fail:
fprintf(stderr, "fenced query error %d\n", rv);
+ printf("\n");
exit(EXIT_FAILURE);
}
diff --git a/group/dlm_controld/action.c b/group/dlm_controld/action.c
index e201e4f..e4180d4 100644
--- a/group/dlm_controld/action.c
+++ b/group/dlm_controld/action.c
@@ -837,6 +837,11 @@ static void find_minors(void)
int found = 0;
int c;
+ control_minor = 0;
+ monitor_minor = 0;
+ plock_minor = 0;
+ old_plock_minor = 0;
+
if (!(fl = fopen("/proc/misc", "r"))) {
log_error("/proc/misc fopen failed: %s", strerror(errno));
return;
@@ -917,7 +922,7 @@ int setup_misc_devices(void)
plock_minor);
}
- if (old_plock_minor) {
+ if (!plock_minor && old_plock_minor) {
rv = find_udev_device("/dev/misc/lock_dlm_plock",
old_plock_minor);
if (rv < 0)