From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13142 invoked by alias); 25 Nov 2008 16:56:33 -0000 Received: (qmail 13112 invoked by alias); 25 Nov 2008 16:56:32 -0000 X-Spam-Level: * X-Spam-Status: No, hits=-4.1 required=5.0 tests=AWL,BAYES_00,KAM_MX,RCVD_IN_JMF_W,SPF_HELO_PASS X-Spam-Check-By: sourceware.org X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on bastion.fedora.phx.redhat.com Subject: cluster: master - dlm_controld: recv error checking To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 98ec6839ab8a2525081c43a40e696b357403aaf4 X-Git-Newrev: 0ec734d325cf822c0da05c12809f009fcae247a3 From: David Teigland Message-Id: <20081125165522.C50BE120213@lists.fedorahosted.org> Date: Tue, 25 Nov 2008 16:56:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q4/txt/msg00399.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0ec734d325cf822c0da05c12809f009fcae247a3 Commit: 0ec734d325cf822c0da05c12809f009fcae247a3 Parent: 98ec6839ab8a2525081c43a40e696b357403aaf4 Author: David Teigland AuthorDate: Tue Nov 25 10:53:51 2008 -0600 Committer: David Teigland CommitterDate: Tue Nov 25 10:53:51 2008 -0600 dlm_controld: recv error checking in process_uevent wasn't looking at errno. Signed-off-by: David Teigland --- group/dlm_controld/main.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/group/dlm_controld/main.c b/group/dlm_controld/main.c index 4af249c..afc8022 100644 --- a/group/dlm_controld/main.c +++ b/group/dlm_controld/main.c @@ -304,12 +304,11 @@ static void process_uevent(int ci) retry_recv: rv = recv(client[ci].fd, &buf, sizeof(buf), 0); - if (rv == -1 && rv == EINTR) - goto retry_recv; - if (rv == -1 && rv == EAGAIN) - return; if (rv < 0) { - log_error("uevent recv error %d errno %d", rv, errno); + if (errno == EINTR) + goto retry_recv; + if (errno != EAGAIN) + log_error("uevent recv error %d errno %d", rv, errno); return; }