This is the mail archive of the
cluster-cvs@sourceware.org
mailing list for the cluster.
Cluster Project branch, RHEL5, updated. cmirror_1_1_15-76-g2c42fa7
- From: jbrassow at sourceware dot org
- To: cluster-cvs at sources dot redhat dot com, cluster-devel at redhat dot com
- Date: 15 May 2008 18:34:09 -0000
- Subject: Cluster Project branch, RHEL5, updated. cmirror_1_1_15-76-g2c42fa7
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=2c42fa7247c3dab78473c5019b03648b40a77dae
The branch, RHEL5 has been updated
via 2c42fa7247c3dab78473c5019b03648b40a77dae (commit)
from 4bb2322b04209f54dd5d3f35efb79cf8b97b7867 (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 2c42fa7247c3dab78473c5019b03648b40a77dae
Author: Jonathan Brassow <jbrassow@redhat.com>
Date: Thu May 15 13:33:50 2008 -0500
clogd: Almost introduced a memory leak
When asking the kernel to resend a request, we still need
to place the data container we would have used back on the
free list.
-----------------------------------------------------------------------
Summary of changes:
cmirror/src/local.c | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/cmirror/src/local.c b/cmirror/src/local.c
index d7f9f8c..44e7243 100644
--- a/cmirror/src/local.c
+++ b/cmirror/src/local.c
@@ -126,13 +126,12 @@ static int kernel_recv(struct clog_tfr **tfr)
if (!(*tfr)->request_type) {
LOG_DBG("Bad transmission, requesting resend [%u]", msg->seq);
+ r = -EAGAIN;
+
if (kernel_ack(msg->seq, EAGAIN)) {
LOG_ERROR("Failed to NACK kernel transmission [%u]",
msg->seq);
r = -EBADE;
- } else {
- r = 0;
- *tfr = NULL;
}
}
break;
@@ -147,7 +146,7 @@ fail:
*tfr = NULL;
}
- return r;
+ return (r == -EAGAIN) ? 0 : r;
}
static int kernel_send_helper(void *data, int out_size)
hooks/post-receive
--
Cluster Project