[Ocfs-tools-commits] smushran commits r211 - trunk/fsck

[svn-commits at oss.oracle.com]

Author: smushran
Date: 2004-09-09 13:09:05 -0500 (Thu, 09 Sep 2004)
New Revision: 211

Modified:
   trunk/fsck/blked.c
   trunk/fsck/utils.c
Log:
__u32 init to UINT_MAX to silence warnings on ia64
cheak_heartbeat added to blked

Modified: trunk/fsck/blked.c
===================================================================
--- trunk/fsck/blked.c	2004-08-31 02:12:06 UTC (rev 210)
+++ trunk/fsck/blked.c	2004-09-09 18:09:05 UTC (rev 211)
@@ -59,7 +59,9 @@
 char *usage_str = 
 "usage: blked.ocfs [OPTIONS] device\n"
 "	-n No hearbeat check\n"
-"	-V Version";
+"	-o Byte offset\n"
+"	-V Version\n"
+"	-w Write";
 
 /*
  * parse_blked_cmdline()
@@ -258,14 +260,13 @@
 		printf("%s: bad signature in super block\n", ctxt.device);
 		goto bail;
 	}
-#if 0
+
 	/* Exit if heartbeat detected */
 	if (!ctxt.no_hb_chk) {
 		if (!check_heart_beat(&ctxt.fd, OCFSCK_PUBLISH_OFF,
 				      OCFS_SECTOR_SIZE))
-			goto quiet_bail;
+			goto bail;
 	}
-#endif
 
 	if (read_one_sector(ctxt.fd, buf, ctxt.offset, 0) == -1) {
 		LOG_INTERNAL();

Modified: trunk/fsck/utils.c
===================================================================
--- trunk/fsck/utils.c	2004-08-31 02:12:06 UTC (rev 210)
+++ trunk/fsck/utils.c	2004-09-09 18:09:05 UTC (rev 211)
@@ -564,7 +564,7 @@
 
 	qsort(files->data, files->len, sizeof(__u32), &comp_nums);
 
-	num = oldnum = ULONG_MAX;
+	num = oldnum = UINT_MAX;
 	for (i = 0; i < files->len; ++i) {
 		num = g_array_index(files, __u32, i);
 		if (num != oldnum) {
@@ -1123,7 +1123,7 @@
 		goto bail;
 
 	if (type == bm_global)
-		fnum = ULONG_MAX;
+		fnum = UINT_MAX;
 
 	if ((buf = malloc(sizeof(bitmap_data) * num)) == NULL) {
 		LOG_INTERNAL();