From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26367 invoked by alias); 7 May 2008 09:35:49 -0000 Received: (qmail 26337 invoked by uid 9452); 7 May 2008 09:35:49 -0000 Date: Wed, 07 May 2008 09:35:00 -0000 Message-ID: <20080507093549.26322.qmail@sourceware.org> From: ccaulfield@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, master, updated. cluster-2.99.00-25-ge4298aa X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d502ffd9b0b02bdc8140973d757eb55bd5d8f7c5 X-Git-Newrev: e4298aaf1dfc5c5909ab72d37fff946caf68241d 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-q2/txt/msg00257.txt.bz2 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=e4298aaf1dfc5c5909ab72d37fff946caf68241d The branch, master has been updated via e4298aaf1dfc5c5909ab72d37fff946caf68241d (commit) from d502ffd9b0b02bdc8140973d757eb55bd5d8f7c5 (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 e4298aaf1dfc5c5909ab72d37fff946caf68241d Author: Christine Caulfield Date: Wed May 7 10:31:08 2008 +0100 [CMAN] make qdisk compile on i386 The combination of -Werror and an attempt to print a size_t on several architectures was causing it not to build on i386. The cast isn't ideal, but it's only a log message. Signed-off-by: Christine Caulfield ----------------------------------------------------------------------- Summary of changes: cman/qdisk/main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c index 6f6ee1c..92bfb51 100644 --- a/cman/qdisk/main.c +++ b/cman/qdisk/main.c @@ -478,7 +478,7 @@ quorum_init(qd_ctx *ctx, node_info_t *ni, int max, struct h_data *h, int maxh) } log_printf(LOG_DEBUG, "I/O Size: %lu Page Size: %lu\n", - ctx->qc_disk.d_blksz, ctx->qc_disk.d_pagesz); + (unsigned long)ctx->qc_disk.d_blksz, (unsigned long)ctx->qc_disk.d_pagesz); if (h && maxh) { start_score_thread(ctx, h, maxh); @@ -1531,7 +1531,7 @@ main(int argc, char **argv) "Specified device %s does match kernel's " "reported sector size (%lu != %d)\n", ctx.qc_device, - ctx.qc_disk.d_blksz, rv); + (unsigned long)ctx.qc_disk.d_blksz, rv); check_stop_cman(&ctx); goto out; } hooks/post-receive -- Cluster Project