[Ocfs2-tools-commits] zab commits r1093 - in branches/ocfs2-tools-1.2: debugfs.ocfs2 fsck.ocfs2

[svn-commits at oss.oracle.com]

Author: zab
Date: 2005-09-28 18:16:17 -0500 (Wed, 28 Sep 2005)
New Revision: 1093

Modified:
   branches/ocfs2-tools-1.2/debugfs.ocfs2/dump.c
   branches/ocfs2-tools-1.2/fsck.ocfs2/pass1.c
Log:
o bring slot fix from rev 1092 in trunk
[1092] fix two missed casts when mixing the u16 slot disk struct and -1/int code


Modified: branches/ocfs2-tools-1.2/debugfs.ocfs2/dump.c
===================================================================
--- branches/ocfs2-tools-1.2/debugfs.ocfs2/dump.c	2005-09-28 23:08:26 UTC (rev 1092)
+++ branches/ocfs2-tools-1.2/debugfs.ocfs2/dump.c	2005-09-28 23:16:17 UTC (rev 1093)
@@ -208,7 +208,7 @@
 		in->i_mtime_nsec, in->i_mtime_nsec);
 
 	fprintf(out, "\tLast Extblk: %"PRIu64"\n", in->i_last_eb_blk);
-	if (in->i_suballoc_slot == OCFS2_INVALID_SLOT)
+	if (in->i_suballoc_slot == (uint16_t)OCFS2_INVALID_SLOT)
 		strcpy(tmp_str, "Global");
 	else
 		sprintf(tmp_str, "%d", in->i_suballoc_slot);

Modified: branches/ocfs2-tools-1.2/fsck.ocfs2/pass1.c
===================================================================
--- branches/ocfs2-tools-1.2/fsck.ocfs2/pass1.c	2005-09-28 23:08:26 UTC (rev 1092)
+++ branches/ocfs2-tools-1.2/fsck.ocfs2/pass1.c	2005-09-28 23:16:17 UTC (rev 1093)
@@ -156,7 +156,7 @@
 		  "%"PRId16"\n", blkno, val, oldval, slot);
 
 	/* make sure the inode's fields are consistent if it's allocated */
-	if (val == 1 && slot != di->i_suballoc_slot &&
+	if (val == 1 && slot != (int16_t)di->i_suballoc_slot &&
 	    prompt(ost, PY, PR_INODE_SUBALLOC,
 		   "Inode %"PRIu64" indicates that it was allocated "
 		   "from slot %"PRId16" but slot %"PRId16"'s chain allocator "