Cluster Project branch, master, updated. gfs-kernel_0_1_22-89-g5802dd9

Cluster Project branch, master, updated. gfs-kernel_0_1_22-89-g5802dd9

[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=5802dd9743d7a020d1a9bc47da2dccdbc39a6514

The branch, master has been updated
       via  5802dd9743d7a020d1a9bc47da2dccdbc39a6514 (commit)
       via  24a202ca9ef616bf8f3def69dc52b55684e0d1f3 (commit)
      from  f4a6e5e1e81f8355cd0f50f032e6f443db17ade9 (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 5802dd9743d7a020d1a9bc47da2dccdbc39a6514
Author: Lon Hohberger <lhh@redhat.com>
Date:   Thu Mar 20 16:42:09 2008 -0400

    [cman] Make mkqdisk print all device paths

commit 24a202ca9ef616bf8f3def69dc52b55684e0d1f3
Author: Lon Hohberger <lhh@redhat.com>
Date:   Thu Mar 20 16:34:20 2008 -0400

    [cman] Fix qdisk Makefile / disk_util merge bugs

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

Summary of changes:
 cman/qdisk/Makefile    |    2 +-
 cman/qdisk/disk_util.c |    2 +-
 cman/qdisk/proc.c      |    4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cman/qdisk/Makefile b/cman/qdisk/Makefile
index e5c7f27..e587941 100644
--- a/cman/qdisk/Makefile
+++ b/cman/qdisk/Makefile
@@ -29,7 +29,7 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir}
 CFLAGS += -I$(S)
 CFLAGS += -I${incdir}
 
-EXTRA_LDFLAGS += -lcman -lccs
+EXTRA_LDFLAGS += -L${cmanlibdir} -L${ccslibdir} -lcman -lccs
 #
 # XXX Fabio has a way to clean up the devmapper requirement
 #
diff --git a/cman/qdisk/disk_util.c b/cman/qdisk/disk_util.c
index a3d73d8..f5539c0 100644
--- a/cman/qdisk/disk_util.c
+++ b/cman/qdisk/disk_util.c
@@ -71,7 +71,7 @@ getuptime(struct timeval *tv)
 	if (!fp)
 		return -1;
 
-#if defined(__sparc__) || defined(__hppa__) || defined(__sparc64__) || defined (__hppa64__)
+#if defined(__sparc__) || defined(__sparc64__)
 	rv = fscanf(fp,"%ld.%d %ld.%d\n", &tv->tv_sec, &tv->tv_usec,
 		    &junk.tv_sec, &junk.tv_usec);
 #else
diff --git a/cman/qdisk/proc.c b/cman/qdisk/proc.c
index 6c7ef48..f27faa2 100644
--- a/cman/qdisk/proc.c
+++ b/cman/qdisk/proc.c
@@ -199,8 +199,10 @@ void
 print_qdisk_info(struct devnode *dn)
 {
 	quorum_header_t *qh = (quorum_header_t *)dn->filter;
+	struct devpath *dp;
 
-	printf("%s:\n", dn->devpath->path);
+	for (dp = dn->devpath; dp; dp = dp->next)
+		printf("%s:\n", dp->path);
 	printf("\tMagic:                %08x\n", qh->qh_magic);
 	printf("\tLabel:                %s\n", qh->qh_cluster);
 	printf("\tCreated:              %s",


hooks/post-receive
--
Cluster Project