Attachment 304048 Details for Bug 444529 – Updated patch

[patch] Updated patch

rhel5-444529.patch (text/plain), 2.14 KB, created by Lon Hohberger on 2008-04-28 21:50:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lon Hohberger

Created: 2008-04-28 21:50:27 UTC

Size: 2.14 KB

patch

obsolete

>diff --git a/fence/fenced/main.c b/fence/fenced/main.c
>index f0f23e5..c3d1720 100644
>--- a/fence/fenced/main.c
>+++ b/fence/fenced/main.c
>@@ -480,7 +480,7 @@ static int loop(void)
> 		for (i = 1; i <= maxi; i++) {
> 			if (client[i].fd < 0)
> 				continue;
>-			if (pollfd[i].revents & POLLHUP) {
>+			if (pollfd[i].revents & (POLLERR | POLLHUP | POLLNVAL)) {
> 				if (pollfd[i].fd == member_fd) {
> 					log_error("cluster is down, exiting");
> 					exit(1);
>diff --git a/group/daemon/main.c b/group/daemon/main.c
>index 81c5392..19fbf48 100644
>--- a/group/daemon/main.c
>+++ b/group/daemon/main.c
>@@ -764,7 +764,7 @@ static int loop(void)
> 		for (i = 0; i <= client_maxi; i++) {
> 			if (client[i].fd < 0)
> 				continue;
>-			if (pollfd[i].revents & POLLHUP) {
>+			if (pollfd[i].revents & (POLLERR | POLLHUP | POLLNVAL)) {
> 				deadfn = client[i].deadfn;
> 				deadfn(i);
> 			} else if (pollfd[i].revents & POLLIN) {
>diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
>index 4aee976..1588605 100644
>--- a/group/dlm_controld/main.c
>+++ b/group/dlm_controld/main.c
>@@ -667,7 +667,7 @@ static int loop(void)
> 				workfn = client[i].workfn;
> 				workfn(i);
> 			}
>-			if (pollfd[i].revents & POLLHUP) {
>+			if (pollfd[i].revents & (POLLHUP | POLLERR | POLLNVAL)) {
> 				deadfn = client[i].deadfn;
> 				deadfn(i);
> 			}
>diff --git a/group/gfs_controld/main.c b/group/gfs_controld/main.c
>index 59ac66d..b2edc32 100644
>--- a/group/gfs_controld/main.c
>+++ b/group/gfs_controld/main.c
>@@ -617,7 +617,7 @@ int loop(void)
> 					process_client(i);
> 			}
> 
>-			if (pollfd[i].revents & POLLHUP) {
>+			if (pollfd[i].revents & (POLLHUP | POLLERR | POLLNVAL)) {
> 				if (pollfd[i].fd == cman_fd) {
> 					log_error("cman connection died");
> 					exit_cman();
>diff --git a/group/test/clientd.c b/group/test/clientd.c
>index 940448f..4a8411e 100644
>--- a/group/test/clientd.c
>+++ b/group/test/clientd.c
>@@ -172,7 +172,7 @@ int loop(void)
> 			log_error("poll");
> 
> 		for (i = 0; i <= maxi; i++) {
>-			if (pollfd[i].revents & POLLHUP) {
>+			if (pollfd[i].revents & (POLLHUP | POLLERR | POLLNVAL)) {
> 				process_hup(pollfd[i].fd);
> 			} else if (pollfd[i].revents & POLLIN) {
> 				process_input(pollfd[i].fd);

Actions: View | Diff

Attachments on bug 444529: 304047 | 304048