[Ocfs2-tools-commits] jlbec commits r363 - in trunk: fsck.ocfs2 libocfs2/include

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-11-03 19:25:57 -0600 (Wed, 03 Nov 2004)
New Revision: 363

Modified:
   trunk/fsck.ocfs2/pass1.c
   trunk/libocfs2/include/ocfs2.h
Log:

o Fix blocks_in_bytes scoping
o Fix a printf



Modified: trunk/fsck.ocfs2/pass1.c
===================================================================
--- trunk/fsck.ocfs2/pass1.c	2004-11-04 00:30:49 UTC (rev 362)
+++ trunk/fsck.ocfs2/pass1.c	2004-11-04 01:25:57 UTC (rev 363)
@@ -231,7 +231,7 @@
 		if (prompt(ost, PN, "The target of symlink inode %"PRIu64" "
 			   "fits in %"PRIu64" blocks but the inode has "
 			   "%"PRIu64" allocated.  Clear the inode?", 
-			   di->i_blkno, expected, di->i_blkno)) {
+			   di->i_blkno, expected, vb->vb_num_blocks)) {
 			vb->vb_clear = 1;
 			return;
 		}

Modified: trunk/libocfs2/include/ocfs2.h
===================================================================
--- trunk/libocfs2/include/ocfs2.h	2004-11-04 00:30:49 UTC (rev 362)
+++ trunk/libocfs2/include/ocfs2.h	2004-11-04 01:25:57 UTC (rev 363)
@@ -447,8 +447,7 @@
 	uint64_t ret = bytes + fs->fs_blocksize - 1;
 
 	if (ret < bytes) /* deal with wrapping */
-		ret = UINT64_MAX;
-		return ret;
+		return UINT64_MAX;
 
 	return ret >> OCFS2_RAW_SB(fs->fs_super)->s_blocksize_bits;
 }