Cluster Project branch, RHEL5, updated. cmirror_1_1_15-58-g940c048

[lhh@sourceware.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=940c0488bdaa11a4833788b3d3957248e4765105

The branch, RHEL5 has been updated
       via  940c0488bdaa11a4833788b3d3957248e4765105 (commit)
      from  38c7b171fee73837a539a441b9a408860c07f1d6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 940c0488bdaa11a4833788b3d3957248e4765105
Author: Lon Hohberger <lhh@redhat.com>
Date:   Mon Apr 28 17:51:46 2008 -0400

    [cman] Fix infinite loop in several daemons
    
    Bugzilla #444529

-----------------------------------------------------------------------

Summary of changes:
 fence/fenced/main.c       |    2 +-
 group/daemon/main.c       |    2 +-
 group/dlm_controld/main.c |    2 +-
 group/gfs_controld/main.c |    2 +-
 group/test/clientd.c      |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

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);


hooks/post-receive
--
Cluster Project