* Ported to Linux's Second Extended File System as part of the
* dump and restore backup suit
* Remy Card <card@Linux.EU.Org>, 1994-1997
- * Stelian Pop <pop@noos.fr>, 1999-2000
- * Stelian Pop <pop@noos.fr> - Alcôve <www.alcove.fr>, 2000
+ * Stelian Pop <stelian@popies.net>, 1999-2000
+ * Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
*/
/*-
#ifndef lint
static const char rcsid[] =
- "$Id: traverse.c,v 1.34 2001/06/18 10:58:28 stelian Exp $";
+ "$Id: traverse.c,v 1.43 2002/02/04 11:18:46 stelian Exp $";
#endif /* not lint */
#include <config.h>
static int searchdir __P((dump_ino_t ino, daddr_t blkno, long size, long filesize));
#endif
static void mapfileino __P((dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped));
-static int exclude_ino __P((dump_ino_t ino));
-extern dump_ino_t iexclude_list[IEXCLUDE_MAXNUM]; /* the inode exclude list */
-extern int iexclude_num; /* number of elements in list */
#ifdef HAVE_EXT2_JOURNAL_INUM
#define ext2_journal_ino(sb) (sb->s_journal_inum)
dump_ino_t journal_ino = ext2_journal_ino(es);
if (es->s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV){
- fprintf(stderr, "This an journal, not a filesystem!\n");
+ msg("This is a journal, not a filesystem!\n");
retval = EXT2_ET_UNSUPP_FEATURE;
ext2fs_close(*fs);
}
else if ((retval = es->s_feature_incompat &
~(EXT2_LIB_FEATURE_INCOMPAT_SUPP |
EXT3_FEATURE_INCOMPAT_RECOVER))) {
- fprintf(stderr,
- "Unsupported feature(s) 0x%x in filesystem\n",
+ msg("Unsupported feature(s) 0x%x in filesystem\n",
retval);
retval = EXT2_ET_UNSUPP_FEATURE;
ext2fs_close(*fs);
else {
if (es->s_feature_compat &
EXT3_FEATURE_COMPAT_HAS_JOURNAL &&
- journal_ino && !exclude_ino(journal_ino)) {
- iexclude_list[iexclude_num++] = journal_ino;
- msg("Exclude ext3 journal inode %u\n",
- journal_ino);
- }
- if (!exclude_ino(EXT2_RESIZE_INO))
- iexclude_list[iexclude_num++] = EXT2_RESIZE_INO;
+ journal_ino)
+ do_exclude_ino(journal_ino, "journal inode");
+ do_exclude_ino(EXT2_RESIZE_INO, "resize inode");
}
}
return retval;
return (blkest + 1);
}
-/*
- * This tests whether an inode is in the exclude list
- */
-int
-exclude_ino(dump_ino_t ino)
-{
- /* 04-Feb-00 ILC */
- if (iexclude_num) { /* if there are inodes in the exclude list */
- int idx; /* then check this inode against it */
- for (idx = 0; idx < iexclude_num; idx++)
- if (ino == iexclude_list[idx])
- return 1;
- }
- return 0;
-}
-
/* Auxiliary macro to pick up files changed since previous dump. */
#define CHANGEDSINCE(dp, t) \
((dp)->di_mtime >= (t) || (dp)->di_ctime >= (t))
static void
mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped)
{
- register int mode;
+ int mode;
/*
* Skip inode if we've already marked it for dumping
int
mapfiles(dump_ino_t maxino, long *tapesize)
{
- register dump_ino_t ino;
+ dump_ino_t ino;
int anydirskipped = 0;
for (ino = ROOTINO; ino < maxino; ino++)
static int
mapfilesindir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private)
{
- register struct dinode const *dp;
- register int mode;
+ struct dinode const *dp;
+ int mode;
errcode_t retval;
struct mapfile_context *mfc;
ext2_ino_t ino;
int
mapdirs(dump_ino_t maxino, long *tapesize)
{
- register struct dinode *dp;
- register int isdir;
- register char *map;
- register dump_ino_t ino;
+ struct dinode *dp;
+ int isdir;
+ char *map;
+ dump_ino_t ino;
#ifndef __linux__
- register int i;
+ int i;
long filesize;
#else
struct mapdirs_context mdc;
dirindir(dump_ino_t ino, daddr_t blkno, int ind_level, long *filesize)
{
int ret = 0;
- register int i;
+ int i;
daddr_t idblk[MAXNINDIR];
bread(fsbtodb(sblock, blkno), (char *)idblk, (int)sblock->fs_bsize);
static int
searchdir(dump_ino_t ino, daddr_t blkno, long size, long filesize)
{
- register struct direct *dp;
- register long loc, ret = 0;
+ struct direct *dp;
+ long loc, ret = 0;
char dblk[MAXBSIZE];
bread(fsbtodb(sblock, blkno), dblk, (int)size);
ext2fs_block_iterate2(fs, (ext2_ino_t)ino, 0, NULL, dumponeblock, (void *)&bc);
/* deal with holes at the end of the inode */
- remaining = i_size - bc.next_block*sblock->fs_fsize;
- if (remaining > 0)
+ if (i_size > ((u_quad_t)bc.next_block) * sblock->fs_fsize) {
+ remaining = i_size - ((u_quad_t)bc.next_block) * sblock->fs_fsize;
for (i = 0; i < howmany(remaining, sblock->fs_fsize); i++) {
bc.buf[bc.cnt++] = 0;
if (bc.cnt == bc.max) {
bc.cnt = 0;
}
}
+ }
if (bc.cnt > 0) {
blksout (bc.buf, bc.cnt, bc.ino);
}
void
blksout(daddr_t *blkp, int frags, dump_ino_t ino)
{
- register daddr_t *bp;
+ daddr_t *bp;
int i, j, count, blks, tbperdb;
blks = howmany(frags * sblock->fs_fsize, TP_BSIZE);
void
dumpmap(char *map, int type, dump_ino_t ino)
{
- register int i;
+ int i;
char *cp;
spcl.c_type = type;
writerec(cp, 0);
}
-/*
- * Write a header record to the dump tape.
- */
#if defined __linux__ && !defined(int32_t)
#define int32_t __s32
#endif
+
+/*
+ * Compute and fill in checksum information.
+ */
void
-writeheader(dump_ino_t ino)
+mkchecksum(union u_spcl *tmpspcl)
{
- register int32_t sum, cnt, *lp;
+ int32_t sum, cnt, *lp;
- spcl.c_inumber = ino;
- spcl.c_magic = NFS_MAGIC;
- spcl.c_checksum = 0;
- lp = (int32_t *)&spcl;
+ tmpspcl->s_spcl.c_checksum = 0;
+ lp = (int32_t *)&tmpspcl->s_spcl;
sum = 0;
cnt = sizeof(union u_spcl) / (4 * sizeof(int32_t));
while (--cnt >= 0) {
sum += *lp++;
sum += *lp++;
}
- spcl.c_checksum = CHECKSUM - sum;
+ tmpspcl->s_spcl.c_checksum = CHECKSUM - sum;
+}
+
+/*
+ * Write a header record to the dump tape.
+ */
+void
+writeheader(dump_ino_t ino)
+{
+ spcl.c_inumber = ino;
+ spcl.c_magic = NFS_MAGIC;
+ mkchecksum((union u_spcl *)&spcl);
writerec((char *)&spcl, 1);
}
/*
* 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;
-#define BREADEMAX 32
void
bread(daddr_t blkno, char *buf, int size)
else
msg("short read error from %s: [block %d]: count=%d, got=%d\n",
disk, blkno, size, cnt);
- if (++breaderrors > BREADEMAX) {
+ if (++breaderrors > breademax) {
msg("More than %d block read errors from %d\n",
- BREADEMAX, disk);
+ breademax, disk);
broadcast("DUMP IS AILING!\n");
msg("This is an unrecoverable error.\n");
if (!query("Do you want to attempt to continue?")){