cluster: STABLE31 - libdlm: stop looking for dlm devices in /dev/misc and access /dev directly

Fabio M. Di Nitto fabbione at fedoraproject.org
Tue Feb 8 15:42:06 UTC 2011


Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=f7d98e763f40e3e7630cf687ec791c446aade8cc
Commit:        f7d98e763f40e3e7630cf687ec791c446aade8cc
Parent:        17dbf63a93049318c985ef4449293778a5fad3d7
Author:        Fabio M. Di Nitto <fdinitto at redhat.com>
AuthorDate:    Tue Feb 8 16:40:36 2011 +0100
Committer:     Fabio M. Di Nitto <fdinitto at redhat.com>
CommitterDate: Tue Feb 8 16:40:36 2011 +0100

libdlm: stop looking for dlm devices in /dev/misc and access /dev directly

Signed-off-by: Fabio M. Di Nitto <fdinitto at redhat.com>
---
 dlm/libdlm/libdlm.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlm/libdlm/libdlm.c b/dlm/libdlm/libdlm.c
index dadf1d2..3c3a31a 100644
--- a/dlm/libdlm/libdlm.c
+++ b/dlm/libdlm/libdlm.c
@@ -24,11 +24,11 @@
 #include "libdlm.h"
 #include <linux/dlm_device.h>
 
-#define MISC_PREFIX		"/dev/misc/"
+#define DEV_PREFIX		"/dev/"
 #define DLM_PREFIX		"dlm_"
-#define DLM_MISC_PREFIX		MISC_PREFIX DLM_PREFIX
+#define DLM_MISC_PREFIX		DEV_PREFIX DLM_PREFIX
 #define DLM_CONTROL_NAME	"dlm-control"
-#define DLM_CONTROL_PATH	MISC_PREFIX DLM_CONTROL_NAME
+#define DLM_CONTROL_PATH	DEV_PREFIX DLM_CONTROL_NAME
 #define DEFAULT_LOCKSPACE	"default"
 
 /*
@@ -427,7 +427,7 @@ static int find_udev_device(const char *lockspace, int minor, char *udev_path)
 
 		/* look for a device with a truncated name */
 
-		d = opendir(MISC_PREFIX);
+		d = opendir(DEV_PREFIX);
 		while ((de = readdir(d))) {
 			if (de->d_name[0] == '.')
 				continue;
@@ -435,7 +435,7 @@ static int find_udev_device(const char *lockspace, int minor, char *udev_path)
 				continue;
 			if (strncmp(de->d_name, basename, MAX_SYSFS_NAME))
 				continue;
-			snprintf(tmp_path, PATH_MAX, MISC_PREFIX "%s",
+			snprintf(tmp_path, PATH_MAX, DEV_PREFIX "%s",
 				 de->d_name);
 			if (stat(tmp_path, &st))
 				continue;


More information about the cluster-commits mailing list