Attachment 311504 Details for Bug 315741 – patch to test

patch to test

groupd-nolock-2.patch (text/plain), 1.78 KB, created by David Teigland on 2008-07-10 19:06:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Teigland

Created: 2008-07-10 19:06:50 UTC

Size: 1.78 KB

patch

obsolete

>commit 6f383496ac1e0a8778325c1d2836fe900aa6dfd7
>Author: David Teigland <teigland@redhat.com>
>Date:   Wed Jul 9 09:49:58 2008 -0500
>
>    gfs_controld: ignore nolock gfs
>    
>    When starting up, we look for existing, "uncontrolled" gfs file systems
>    in the kernel (which would require the node to be rebooted.) This check
>    needs to ignore nolock fs's.
>    
>    Signed-off-by: David Teigland <teigland@redhat.com>
>
>diff --git a/group/daemon/main.c b/group/daemon/main.c
>index 19fbf48..c80a024 100644
>--- a/group/daemon/main.c
>+++ b/group/daemon/main.c
>@@ -106,6 +106,29 @@ static int do_read(int fd, void *buf, size_t count)
>    - we won't be in groupd cpg until after we've verified there's no
>      local residual gfs/dlm state */
> 
>+static int ignore_gfs_nolock(char *sysfs_dir, char *table)
>+{
>+	char path[PATH_MAX];
>+	int rv, fd;
>+
>+	if (!strstr(sysfs_dir, "gfs"))
>+		return 0;
>+
>+	memset(path, 0, PATH_MAX);
>+
>+	snprintf(path, PATH_MAX, "%s/%s/lock_module/proto_name",
>+		 sysfs_dir, table);
>+
>+	/* lock_nolock doesn't create the "lock_module" dir at all,
>+	   so we'll fail to open this */
>+
>+	fd = open(path, O_RDONLY);
>+	if (fd < 0)
>+		return 1;
>+
>+	return 0;
>+}
>+
> static int kernel_instance_count(char *sysfs_dir)
> {
> 	char path[PATH_MAX];
>@@ -124,6 +147,9 @@ static int kernel_instance_count(char *sysfs_dir)
> 		if (de->d_name[0] == '.')
> 			continue;
> 
>+		if (ignore_gfs_nolock(sysfs_dir, de->d_name))
>+			continue;
>+
> 		log_print("found uncontrolled kernel object %s in %s",
> 			  de->d_name, sysfs_dir);
> 		rv++;
>@@ -138,8 +164,6 @@ int check_uncontrolled_groups(void)
> 	char *argv[4];
> 	int status, rv = 0;
> 
>-	/* FIXME: ignore gfs/gfs2 nolock fs's */
>-
> 	rv += kernel_instance_count("/sys/kernel/dlm");
> 	rv += kernel_instance_count("/sys/fs/gfs");
> 	rv += kernel_instance_count("/sys/fs/gfs2");

Actions: View

Attachments on bug 315741: 311380 | 311504