Another try at fixing size estimate.

diff --git a/CHANGES b/CHANGES
index a67e5f5fc8c306675150934c1aa4e53d36057c33..fa664c4f53c15d06fcfc8e6cd932ef4d41fa8a69 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-$Id: CHANGES,v 1.241 2004/02/18 16:26:40 stelian Exp $
+$Id: CHANGES,v 1.242 2004/03/01 15:38:10 stelian Exp $
 
 Changes between versions 0.4b35 and 0.4b36 (released ?????????????????)
 =======================================================================
@@ -27,6 +27,8 @@ Changes between versions 0.4b35 and 0.4b36 (released ?????????????????)
 6.     Made explicit in the dump man page that dump will not create
        a remote file, it will only write to an already existing one.
 
+7.     Another try at making size estimates better again.
+
 Changes between versions 0.4b34 and 0.4b35 (released December 21, 2003)
 =======================================================================
 

diff --git a/dump/traverse.c b/dump/traverse.c
index 2142abc0c274d5c481dee154556c7909c28fa1ef..fb868dba4050aec08cc81ae8a961cc5eb6045f19 100644 (file)
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: traverse.c,v 1.56 2003/10/26 16:05:47 stelian Exp $";
+       "$Id: traverse.c,v 1.57 2004/03/01 15:38:13 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -202,9 +202,9 @@ blockest(struct dinode const *dp)
         *      dump blocks (sizeest vs. blkest in the indirect block
         *      calculation).
         */
-       blkest = howmany((u_quad_t)dp->di_blocks * 512, TP_BSIZE);
+       blkest = howmany((u_quad_t)dp->di_blocks * 512, fs->blocksize) * (fs->blocksize / TP_BSIZE);
        i_size = dp->di_size + ((u_quad_t) dp->di_size_high << 32);
-       sizeest = howmany(i_size, TP_BSIZE);
+       sizeest = howmany(i_size, fs->blocksize) * (fs->blocksize / TP_BSIZE);
        if (blkest > sizeest)
                blkest = sizeest;
 #ifdef __linux__
@@ -212,7 +212,7 @@ blockest(struct dinode const *dp)
                /* calculate the number of indirect blocks on the dump tape */
                blkest +=
                        howmany(sizeest - NDADDR * fs->blocksize / TP_BSIZE,
-                       NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super));
+                       TP_NINDIR);
        }
 #else
        if (i_size > sblock->fs_bsize * NDADDR) {