X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=dump%2Ftraverse.c;h=80d7e86bf17e18441bb28cf38ac708f59d5d516b;hp=3da18d39a628eaa47e4abf9223fd010a9be2bea3;hb=e51470bfc05d83f82c37d24504220c7163bbd4c1;hpb=43ef843b59f89bb96ebec8647aa23ad43ae6789c diff --git a/dump/traverse.c b/dump/traverse.c index 3da18d3..80d7e86 100644 --- a/dump/traverse.c +++ b/dump/traverse.c @@ -2,8 +2,8 @@ * Ported to Linux's Second Extended File System as part of the * dump and restore backup suit * Remy Card , 1994-1997 - * Stelian Pop , 1999-2000 - * Stelian Pop - Alcôve , 2000 + * Stelian Pop , 1999-2000 + * Stelian Pop - Alcôve , 2000-2002 */ /*- @@ -41,7 +41,7 @@ #ifndef lint static const char rcsid[] = - "$Id: traverse.c,v 1.27 2001/03/20 09:14:58 stelian Exp $"; + "$Id: traverse.c,v 1.41 2002/01/25 14:59:53 stelian Exp $"; #endif /* not lint */ #include @@ -55,7 +55,11 @@ static const char rcsid[] = #include #include #ifdef __linux__ +#ifdef HAVE_EXT2FS_EXT2_FS_H +#include +#else #include +#endif #include #include #include @@ -93,22 +97,20 @@ typedef long fsizeT; static int searchdir __P((struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void *private)); #else -static int dirindir __P((ino_t ino, daddr_t blkno, int level, long *size)); -static void dmpindir __P((ino_t ino, daddr_t blk, int level, fsizeT *size)); -static int searchdir __P((ino_t ino, daddr_t blkno, long size, long filesize)); +static int dirindir __P((dump_ino_t ino, daddr_t blkno, int level, long *size)); +static void dmpindir __P((dump_ino_t ino, daddr_t blk, int level, fsizeT *size)); +static int searchdir __P((dump_ino_t ino, daddr_t blkno, long size, long filesize)); #endif -static void mapfileino __P((ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped)); -static int exclude_ino __P((ino_t ino)); -extern ino_t iexclude_list[IEXCLUDE_MAXNUM]; /* the inode exclude list */ -extern int iexclude_num; /* number of elements in list */ +static void mapfileino __P((dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped)); -/* Temporary fix waiting for Andreas fixes... */ -#ifdef HAS_EXT2FS_EXT2_FS +#ifdef HAVE_EXT2_JOURNAL_INUM #define ext2_journal_ino(sb) (sb->s_journal_inum) #else -#define ext2_ino_t __u32 #define ext2_journal_ino(sb) (*((__u32 *)sb + 0x38)) #endif +#ifndef HAVE_EXT2_INO_T +typedef ino_t ext2_ino_t; +#endif #ifndef EXT3_FEATURE_COMPAT_HAS_JOURNAL #define EXT3_FEATURE_COMPAT_HAS_JOURNAL 0x0004 @@ -127,6 +129,9 @@ extern int iexclude_num; /* number of elements in list */ #define EXT2_LIB_FEATURE_INCOMPAT_SUPP (EXT3_FEATURE_INCOMPAT_RECOVER | \ EXT2_FEATURE_INCOMPAT_FILETYPE) #endif +#ifndef EXT2_RESIZE_INO +#define EXT2_RESIZE_INO 7 +#endif int dump_fs_open(const char *disk, ext2_filsys *fs) { @@ -135,7 +140,7 @@ int dump_fs_open(const char *disk, ext2_filsys *fs) retval = ext2fs_open(disk, EXT2_FLAG_FORCE, 0, 0, unix_io_manager, fs); if (!retval) { struct ext2_super_block *es = (*fs)->super; - ext2_ino_t journal_ino = ext2_journal_ino(es); + 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"); @@ -151,12 +156,12 @@ int dump_fs_open(const char *disk, ext2_filsys *fs) retval = EXT2_ET_UNSUPP_FEATURE; ext2fs_close(*fs); } - else if (es->s_feature_compat & + else { + if (es->s_feature_compat & EXT3_FEATURE_COMPAT_HAS_JOURNAL && - journal_ino && !exclude_ino(journal_ino)) { - iexclude_list[iexclude_num++] = journal_ino; - msg("Added ext3 journal inode %d to exclude list\n", - journal_ino); + journal_ino) + do_exclude_ino(journal_ino, "journal inode"); + do_exclude_ino(EXT2_RESIZE_INO, "resize inode"); } } return retval; @@ -212,22 +217,6 @@ blockest(struct dinode const *dp) return (blkest + 1); } -/* - * This tests whether an inode is in the exclude list - */ -int -exclude_ino(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)) @@ -250,7 +239,7 @@ exclude_ino(ino_t ino) * copy of the given inode, or be NULL (in which case it is fetched.) */ static void -mapfileino(ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped) +mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped) { register int mode; @@ -300,7 +289,7 @@ mapfileino(ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped) */ #ifdef __linux__ int -mapfiles(ino_t maxino, long *tapesize) +mapfiles(dump_ino_t maxino, long *tapesize) { ext2_ino_t ino; int anydirskipped = 0; @@ -344,9 +333,9 @@ mapfiles(ino_t maxino, long *tapesize) } #else int -mapfiles(ino_t maxino, long *tapesize) +mapfiles(dump_ino_t maxino, long *tapesize) { - register ino_t ino; + register dump_ino_t ino; int anydirskipped = 0; for (ino = ROOTINO; ino < maxino; ino++) @@ -361,6 +350,54 @@ mapfiles(ino_t maxino, long *tapesize) } #endif /* __linux__ */ +#ifdef __linux__ +int +maponefile(dump_ino_t maxino, long *tapesize, char *directory) +{ + errcode_t retval; + ext2_ino_t dir_ino; + char dir_name [MAXPATHLEN]; + int i, anydirskipped = 0; + + /* + * Mark every directory in the path as being dumped + */ + for (i = 0; i < strlen (directory); i++) { + if (directory[i] == '/') { + strncpy (dir_name, directory, i); + dir_name[i] = '\0'; + retval = ext2fs_namei(fs, ROOTINO, ROOTINO, + dir_name, &dir_ino); + if (retval) { + com_err(disk, retval, + "while translating %s", dir_name); + exit(X_ABORT); + } + mapfileino((dump_ino_t) dir_ino, 0, + tapesize, &anydirskipped); + } + } + /* + * Mark the final directory + */ + retval = ext2fs_namei(fs, ROOTINO, ROOTINO, directory, &dir_ino); + if (retval) { + com_err(disk, retval, "while translating %s", directory); + exit(X_ABORT); + } + mapfileino((dump_ino_t)dir_ino, 0, tapesize, &anydirskipped); + + mapfileino(ROOTINO, 0, tapesize, &anydirskipped); + + /* + * Restore gets very upset if the root is not dumped, + * so ensure that it always is dumped. + */ + SETINO(ROOTINO, dumpdirmap); + return anydirskipped; +} +#endif /* __linux__ */ + #ifdef __linux__ struct mapfile_context { long *tapesize; @@ -404,7 +441,7 @@ mapfilesindir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *bu * the directories in the filesystem. */ int -mapfilesfromdir(ino_t maxino, long *tapesize, char *directory) +mapfilesfromdir(dump_ino_t maxino, long *tapesize, char *directory) { errcode_t retval; struct mapfile_context mfc; @@ -483,12 +520,12 @@ struct mapdirs_context { * pass using this algorithm. */ int -mapdirs(ino_t maxino, long *tapesize) +mapdirs(dump_ino_t maxino, long *tapesize) { register struct dinode *dp; register int isdir; register char *map; - register ino_t ino; + register dump_ino_t ino; #ifndef __linux__ register int i; long filesize; @@ -566,7 +603,7 @@ mapdirs(ino_t maxino, long *tapesize) * require the directory to be dumped. */ static int -dirindir(ino_t ino, daddr_t blkno, int ind_level, long *filesize) +dirindir(dump_ino_t ino, daddr_t blkno, int ind_level, long *filesize) { int ret = 0; register int i; @@ -652,7 +689,7 @@ searchdir(struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void #else /* __linux__ */ static int -searchdir(ino_t ino, daddr_t blkno, long size, long filesize) +searchdir(dump_ino_t ino, daddr_t blkno, long size, long filesize) { register struct direct *dp; register long loc, ret = 0; @@ -694,7 +731,7 @@ searchdir(ino_t ino, daddr_t blkno, long size, long filesize) #ifdef __linux__ struct block_context { - ino_t ino; + ext2_ino_t ino; int *buf; int cnt; int max; @@ -737,12 +774,13 @@ dumponeblock(ext2_filsys fs, blk_t *blocknr, e2_blkcnt_t blockcnt, * Dump the contents of an inode to tape. */ void -dumpino(struct dinode *dp, ino_t ino) +dumpino(struct dinode *dp, dump_ino_t ino) { unsigned long cnt; - fsizeT size; + fsizeT size, remaining; char buf[TP_BSIZE]; struct old_bsd_inode obi; + int i; #ifdef __linux__ struct block_context bc; #else @@ -858,7 +896,18 @@ dumpino(struct dinode *dp, ino_t ino) bc.ino = ino; bc.next_block = NDADDR; - ext2fs_block_iterate2(fs, ino, 0, NULL, dumponeblock, (void *)&bc); + ext2fs_block_iterate2(fs, (ext2_ino_t)ino, 0, NULL, dumponeblock, (void *)&bc); + /* deal with holes at the end of the inode */ + 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) { + blksout (bc.buf, bc.cnt, bc.ino); + bc.cnt = 0; + } + } + } if (bc.cnt > 0) { blksout (bc.buf, bc.cnt, bc.ino); } @@ -921,7 +970,7 @@ convert_dir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, * Dumps a directory to tape after converting it to the BSD format */ void -dumpdirino(struct dinode *dp, ino_t ino) +dumpdirino(struct dinode *dp, dump_ino_t ino) { fsizeT size; char buf[TP_BSIZE]; @@ -950,7 +999,7 @@ dumpdirino(struct dinode *dp, ino_t ino) cdc.prev_offset = 0; cdc.bs = MIN(DIRBLKSIZ, TP_BSIZE); /* Do the conversion */ - retval = ext2fs_dir_iterate(fs, ino, 0, NULL, convert_dir, (void *)&cdc); + retval = ext2fs_dir_iterate(fs, (ext2_ino_t)ino, 0, NULL, convert_dir, (void *)&cdc); if (retval) { com_err(disk, retval, "while converting directory #%ld\n", (long)ino); exit(X_ABORT); @@ -1024,7 +1073,7 @@ dumpdirino(struct dinode *dp, ino_t ino) * Read indirect blocks, and pass the data blocks to be dumped. */ static void -dmpindir(ino_t ino, daddr_t blk, int ind_level, fsizeT *size) +dmpindir(dump_ino_t ino, daddr_t blk, int ind_level, fsizeT *size) { int i, cnt; #ifdef __linux__ @@ -1079,7 +1128,7 @@ dmpindir(ino_t ino, daddr_t blk, int ind_level, fsizeT *size) * Collect up the data into tape record sized buffers and output them. */ void -blksout(daddr_t *blkp, int frags, ino_t ino) +blksout(daddr_t *blkp, int frags, dump_ino_t ino) { register daddr_t *bp; int i, j, count, blks, tbperdb; @@ -1115,7 +1164,7 @@ blksout(daddr_t *blkp, int frags, ino_t ino) * Dump a map to the tape. */ void -dumpmap(char *map, int type, ino_t ino) +dumpmap(char *map, int type, dump_ino_t ino) { register int i; char *cp; @@ -1127,21 +1176,20 @@ dumpmap(char *map, int type, ino_t ino) 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(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) { @@ -1150,19 +1198,30 @@ writeheader(ino_t ino) 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); } #ifdef __linux__ struct dinode * -getino(ino_t inum) +getino(dump_ino_t inum) { static struct dinode dinode; errcode_t err; curino = inum; - err = ext2fs_read_inode(fs, inum, (struct ext2_inode *) &dinode); + err = ext2fs_read_inode(fs, (ext2_ino_t)inum, (struct ext2_inode *) &dinode); if (err) { com_err(disk, err, "while reading inode #%ld\n", (long)inum); exit(X_ABORT); @@ -1171,7 +1230,7 @@ getino(ino_t inum) } #else /* __linux__ */ struct dinode * -getino(ino_t inum) +getino(dump_ino_t inum) { static daddr_t minino, maxino; static struct dinode inoblock[MAXINOPB]; @@ -1190,11 +1249,10 @@ getino(ino_t inum) /* * 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) @@ -1233,9 +1291,9 @@ loop: 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?")){