Cluster Project branch, master, updated. cluster-2.99.00-25-ge4298aa

Cluster Project branch, master, updated. cluster-2.99.00-25-ge4298aa

[ccaulfield]

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 <ccaulfie@redhat.com>
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 <ccaulfie@redhat.com>

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

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