From mboxrd@z Thu Jan  1 00:00:00 1970
From: lhh@sourceware.org <lhh@sourceware.org>
Date: 23 Apr 2007 18:24:45 -0000
Subject: [Cluster-devel] cluster/magma-plugins/sm sm.c
Message-ID: <20070423182445.4266.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	cluster
Branch: 	RHEL45
Changes by:	lhh at sourceware.org	2007-04-23 19:24:44

Modified files:
	magma-plugins/sm: sm.c 

Log message:
	Ancillary fix to bug #223907

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/magma-plugins/sm/sm.c.diff?cvsroot=cluster&only_with_tag=RHEL45&r1=1.9.2.11&r2=1.9.2.11.2.1

--- cluster/magma-plugins/sm/Attic/sm.c	2007/01/03 21:09:09	1.9.2.11
+++ cluster/magma-plugins/sm/Attic/sm.c	2007/04/23 18:24:44	1.9.2.11.2.1
@@ -36,7 +36,7 @@
 #include <sys/select.h>
 #include <sys/stat.h>
 
-#define MODULE_DESCRIPTION "CMAN/SM Plugin v1.1.7.3"
+#define MODULE_DESCRIPTION "CMAN/SM Plugin v1.1.7.4"
 #define MODULE_AUTHOR      "Lon Hohberger"
 
 #define DLM_LS_NAME	   "Magma"
@@ -377,7 +377,8 @@
 
 	/* Check for existince of dlm control file so we don't
 	   hang in dlm_acquire_lockspace */
-	if (stat("/dev/dlm-control", &st) < 0)
+	if (stat("/dev/misc/dlm-control", &st) < 0 &&
+	    stat("/dev/dlm-control", &st) < 0)
 		return -1;
 
 	if (p->sockfd >= 0)