Attachment 291185 Details for Bug 294491 – Fix; regression-tested

[patch] Fix; regression-tested

magma-plugins-294491-2.patch (text/plain), 1.83 KB, created by Lon Hohberger on 2008-01-09 18:54:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2008-01-09 18:54:07 UTC

Size: 1.83 KB

patch

obsolete

>Index: sm/sm.c
>===================================================================
>RCS file: /cvs/cluster/cluster/magma-plugins/sm/Attic/sm.c,v
>retrieving revision 1.9.2.12
>diff -u -r1.9.2.12 sm.c
>--- sm/sm.c	23 Apr 2007 18:24:58 -0000	1.9.2.12
>+++ sm/sm.c	9 Jan 2008 18:52:47 -0000
>@@ -36,7 +36,7 @@
> #include <sys/select.h>
> #include <sys/stat.h>
> 
>-#define MODULE_DESCRIPTION "CMAN/SM Plugin v1.1.7.4"
>+#define MODULE_DESCRIPTION "CMAN/SM Plugin v1.1.7.5"
> #define MODULE_AUTHOR      "Lon Hohberger"
> 
> #define DLM_LS_NAME	   "Magma"
>@@ -556,8 +556,9 @@
> 	FD_ZERO(&rfds);
> 	FD_SET(fd, &rfds);
> 
>-	if (select(fd + 1, &rfds, NULL, NULL, NULL) == 1)
>+	if (select(fd + 1, &rfds, NULL, NULL, NULL) == 1) {
> 		return dlm_dispatch(fd);
>+	}
> 
> 	return -1;
> }
>@@ -577,9 +578,12 @@
>         if (ret < 0)
>                 return -1;
> 
>-        if ((ret = (wait_for_dlm_event(p->ls) < 0))) {
>-                fprintf(stderr, "wait_for_dlm_event: %d / %d\n",
>-                        ret, errno);
>+        while ((ret = (wait_for_dlm_event(p->ls) < 0))) {
>+		/* If nothing much has happened, just
>+		   wait a bit longer */
>+		if (lksb->sb_status == EINPROG)
>+			continue;
>+                errno = lksb->sb_status;
>                 return -1;
>         }
> 
>@@ -648,7 +652,11 @@
> 
>         /* lksb->sb_status should be EINPROG at this point */
> 
>-        if (wait_for_dlm_event(p->ls) < 0) {
>+        while (wait_for_dlm_event(p->ls) < 0) {
>+		/* If nothing much has happened, just
>+		   wait a bit longer */
>+		if (lksb->sb_status == EINPROG)
>+			continue;
>                 errno = lksb->sb_status;
>                 return -1;
>         }
>@@ -705,8 +713,11 @@
> 		return ret;
> 
> 	while (lksb.sb_status == EINPROG) {
>-		if (wait_for_dlm_event(p->ls) < 0)
>+		if (wait_for_dlm_event(p->ls) < 0) {
>+			if (lksb.sb_status == EINPROG)
>+				continue;
> 			return -1;
>+		}
> 	}
> 
> 	ret = -1;

Actions: View | Diff

Attachments on bug 294491: 258571 | 291185 | 291213 | 394649 | 394651