Cluster Project branch, STABLE2, updated. cluster-2.03.02-1-g8b99989

Cluster Project branch, STABLE2, updated. cluster-2.03.02-1-g8b99989

[lhh]

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=8b999890c80ded91083daef34313f888344cccd2

The branch, STABLE2 has been updated
       via  8b999890c80ded91083daef34313f888344cccd2 (commit)
      from  54d429a80f07ca662f1c91e4469be9a2f5fc08b3 (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 8b999890c80ded91083daef34313f888344cccd2
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:
 group/dlm_controld/main.c |    2 +-
 group/gfs_controld/main.c |    2 +-
 group/test/clientd.c      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c
index a83eea0..98585fc 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