* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the University of
- * California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
#ifndef lint
static const char rcsid[] =
- "$Id: traverse.c,v 1.54 2003/01/10 14:46:55 stelian Exp $";
+ "$Id: traverse.c,v 1.57 2004/03/01 15:38:13 stelian Exp $";
#endif /* not lint */
#include <config.h>
* 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__
/* 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) {
writerec(cp, 0);
}
-#if defined __linux__ && !defined(int32_t)
+#if defined(__linux__) && !defined(int32_t)
#define int32_t __s32
#endif
/*
* Read a chunk of data from the disk.
* Try to recover from hard errors by reading in sector sized pieces.
- * Error recovery is attempted at most breademax times before seeking
+ * Error recovery is attempted at most BREADEMAX times before seeking
* consent from the operator to continue.
*/
int breaderrors = 0;