[Ocfs2-tools-commits] jlbec commits r874 - in trunk: . libocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2005-05-03 03:20:12 -0500 (Tue, 03 May 2005)
New Revision: 874

Modified:
   trunk/
   trunk/libocfs2/dir_scan.c
Log:
o Fix dir_scan to not walk bast i_size


Property changes on: trunk
___________________________________________________________________
Name: svn:ignore
   - cscope.out
*.a
stamp-md5
configure
Config.make
config.*
autom4te.cache
aclocal.m4


   + cscope.out
*.a
stamp-md5
configure
Config.make
config.*
autom4te.cache
aclocal.m4
ocfs2-tools-*.src.rpm
ocfs2-tools-*.tar.gz


Modified: trunk/libocfs2/dir_scan.c
===================================================================
--- trunk/libocfs2/dir_scan.c	2005-05-02 22:03:52 UTC (rev 873)
+++ trunk/libocfs2/dir_scan.c	2005-05-03 08:20:12 UTC (rev 874)
@@ -150,8 +150,12 @@
 	if (ret)
 		goto bail_inode;
 
-	scan->total_blocks =
-		ocfs2_clusters_to_blocks(fs, scan->inode->ci_inode->i_clusters);
+	scan->total_blocks = scan->inode->ci_inode->i_size /
+		fs->fs_blocksize;
+	/*
+	 * Should we check i_size % blocksize?
+	 * total_blocks <= i_clusters?
+	 */
 
 	scan->total_bufsize = fs->fs_blocksize;