Attachment 608257 Details for Bug 853180 – Proposed and tested patch

[patch] Proposed and tested patch

rhel6.gfs_controld.patch (text/plain), 1.51 KB, created by Robert Peterson on 2012-08-30 16:45:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Peterson

Created: 2012-08-30 16:45:14 UTC

Size: 1.51 KB

patch

obsolete

>commit 8e16ce498450bc2040879b1de4d4f3da0eb795f2
>Author: Bob Peterson <rpeterso@redhat.com>
>Date:   Thu Aug 30 09:59:54 2012 -0500
>
>    gfs_controld: fix mounted nolock check
>    
>    kernel now shows lock_module/proto_name
>
>diff --git a/fence/fenced/main.c b/fence/fenced/main.c
>index cc11382..827dab6 100644
>--- a/fence/fenced/main.c
>+++ b/fence/fenced/main.c
>@@ -636,7 +636,8 @@ static void register_controlled_dir(const char *path)
> static int ignore_nolock(char *sysfs_dir, char *table)
> {
> 	char path[PATH_MAX];
>-	int fd;
>+	char buf[32];
>+	int fd, rv;
> 
> 	memset(path, 0, PATH_MAX);
> 
>@@ -650,7 +651,16 @@ static int ignore_nolock(char *sysfs_dir, char *table)
> 	if (fd < 0)
> 		return 1;
> 
>+	memset(buf, 0, sizeof(buf));
>+
>+	rv = read(fd, buf, sizeof(buf));
> 	close(fd);
>+	if (rv < 0)
>+		return 1;
>+
>+	if (!strncmp(buf, "lock_nolock", 11))
>+		return 1;
>+
> 	return 0;
> }
> 
>diff --git a/group/gfs_controld/util.c b/group/gfs_controld/util.c
>index 7aea26e..80e2bf7 100644
>--- a/group/gfs_controld/util.c
>+++ b/group/gfs_controld/util.c
>@@ -217,7 +217,8 @@ void update_dmsetup_wait(void)
> static int ignore_nolock(const char *sysfs_dir, char *table)
> {
> 	char path[PATH_MAX];
>-	int fd;
>+	char buf[32];
>+	int fd, rv;
> 
> 	memset(path, 0, PATH_MAX);
> 
>@@ -231,7 +232,16 @@ static int ignore_nolock(const char *sysfs_dir, char *table)
> 	if (fd < 0)
> 		return 1;
> 
>+	memset(buf, 0, sizeof(buf));
>+
>+	rv = read(fd, buf, sizeof(buf));
> 	close(fd);
>+	if (rv < 0)
>+		return 1;
>+
>+	if (!strncmp(buf, "lock_nolock", 11))
>+		return 1;
>+
> 	return 0;
> }
>

Actions: View | Diff

Attachments on bug 853180: 608257