* 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@cybercable.fr>, 1999
- *
+ * Stelian Pop <stelian@popies.net>, 1999-2000
+ * Stelian Pop <stelian@popies.net> - AlcĂ´ve <www.alcove.com>, 2000-2002
*/
/*-
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
- *
- * $Id: traverse.c,v 1.5 1999/10/11 13:31:11 stelian Exp $
*/
+#ifndef lint
+static const char rcsid[] =
+ "$Id: traverse.c,v 1.45 2002/04/11 09:19:07 stelian Exp $";
+#endif /* not lint */
+
+#include <config.h>
+#include <ctype.h>
+#include <stdio.h>
+#ifdef __STDC__
+#include <string.h>
+#include <unistd.h>
+#endif
+
#include <sys/param.h>
#include <sys/stat.h>
#ifdef __linux__
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
#include <linux/ext2_fs.h>
+#endif
+#include <ext2fs/ext2fs.h>
#include <bsdcompat.h>
#include <compaterr.h>
#include <stdlib.h>
-#define swab32(x) ext2fs_swab32(x)
-#else /* __linux__ */
-#define swab32(x) x
-#ifdef sunos
+#elif defined sunos
#include <sys/vnode.h>
#include <ufs/fs.h>
#include <ufs/ufs/dir.h>
#include <ufs/ufs/dinode.h>
#include <ufs/ffs/fs.h>
-#endif
#endif /* __linux__ */
#include <protocols/dumprestore.h>
-#include <ctype.h>
-#include <stdio.h>
-#ifdef __STDC__
-#include <string.h>
-#include <unistd.h>
-#endif
-
-#ifdef __linux__
-#include <ext2fs/ext2fs.h>
-#endif
-
#include "dump.h"
#define HASDUMPEDFILE 0x1
#define HASSUBDIRS 0x2
+#ifdef __linux__
+typedef u_quad_t fsizeT;
+#else
#ifdef FS_44INODEFMT
typedef quad_t fsizeT;
#else
typedef long fsizeT;
#endif
+#endif
#ifdef __linux__
static int searchdir __P((struct ext2_dir_entry *dp, int offset,
int blocksize, char *buf, void *private));
-loff_t llseek (int fd, loff_t offset, int origin);
#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((dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped));
+
+#ifdef HAVE_EXT2_JOURNAL_INUM
+#define ext2_journal_ino(sb) (sb->s_journal_inum)
+#else
+#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
+#endif
+#ifndef EXT2_FEATURE_INCOMPAT_FILETYPE
+#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002
+#endif
+#ifndef EXT3_FEATURE_INCOMPAT_RECOVER
+#define EXT3_FEATURE_INCOMPAT_RECOVER 0x0004
+#endif
+#ifndef EXT3_FEATURE_INCOMPAT_JOURNAL_DEV
+#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV 0x0008
+#endif
+
+#ifndef EXT2_LIB_FEATURE_INCOMPAT_SUPP
+#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)
+{
+ int retval;
+
+ retval = ext2fs_open(disk, EXT2_FLAG_FORCE, 0, 0, unix_io_manager, fs);
+ if (!retval) {
+ struct ext2_super_block *es = (*fs)->super;
+ dump_ino_t journal_ino = ext2_journal_ino(es);
+
+ if (es->s_feature_incompat & EXT3_FEATURE_INCOMPAT_JOURNAL_DEV){
+ 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))) {
+ 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)
+ do_exclude_ino(journal_ino, "journal inode");
+ do_exclude_ino(EXT2_RESIZE_INO, "resize inode");
+ }
+ }
+ return retval;
+}
/*
* This is an estimation of the number of TP_BSIZE blocks in the file.
* hence the estimate may be high.
*/
long
-blockest(struct dinode *dp)
+blockest(struct dinode const *dp)
{
long blkest, sizeest;
+ u_quad_t i_size;
/*
* dp->di_size is the size of the file in bytes.
* dump blocks (sizeest vs. blkest in the indirect block
* calculation).
*/
- blkest = howmany(dbtob(dp->di_blocks), TP_BSIZE);
- sizeest = howmany(dp->di_size, TP_BSIZE);
+ blkest = howmany((u_quad_t)dp->di_blocks*fs->blocksize, TP_BSIZE);
+ i_size = dp->di_size + ((u_quad_t) dp->di_size_high << 32);
+ sizeest = howmany(i_size, TP_BSIZE);
if (blkest > sizeest)
blkest = sizeest;
#ifdef __linux__
- if (dp->di_size > fs->blocksize * NDADDR) {
+ if (i_size > fs->blocksize * NDADDR) {
/* calculate the number of indirect blocks on the dump tape */
blkest +=
howmany(sizeest - NDADDR * fs->blocksize / TP_BSIZE,
- TP_NINDIR);
+ NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super));
}
#else
- if (dp->di_size > sblock->fs_bsize * NDADDR) {
+ if (i_size > sblock->fs_bsize * NDADDR) {
/* calculate the number of indirect blocks on the dump tape */
blkest +=
howmany(sizeest - NDADDR * sblock->fs_bsize / TP_BSIZE,
}
/* Auxiliary macro to pick up files changed since previous dump. */
+#define CSINCE(dp, t) \
+ ((dp)->di_ctime >= (t))
+#define MSINCE(dp, t) \
+ ((dp)->di_mtime >= (t))
#define CHANGEDSINCE(dp, t) \
- ((dp)->di_mtime >= (t) || (dp)->di_ctime >= (t))
+ (CSINCE(dp, t) || MSINCE(dp, t))
-/* The WANTTODUMP macro decides whether a file should be dumped. */
+/* The NODUMP_FLAG macro tests if a file has the nodump flag. */
#ifdef UF_NODUMP
-#define WANTTODUMP(dp) \
- (CHANGEDSINCE(dp, spcl.c_ddate) && \
- (nonodump || ((dp)->di_flags & UF_NODUMP) != UF_NODUMP))
+#define NODUMP_FLAG(dp) (!nonodump && (((dp)->di_flags & UF_NODUMP) == UF_NODUMP))
#else
-#define WANTTODUMP(dp) CHANGEDSINCE(dp, spcl.c_ddate)
+#define NODUMP_FLAG(dp) 0
#endif
+/* The WANTTODUMP macro decides whether a file should be dumped. */
+#define WANTTODUMP(dp, ino) \
+ (CHANGEDSINCE(dp, spcl.c_ddate) && \
+ (!NODUMP_FLAG(dp)) && \
+ (!exclude_ino(ino)))
+
+/*
+ * Determine if given inode should be dumped. "dp" must either point to a
+ * copy of the given inode, or be NULL (in which case it is fetched.)
+ */
+static void
+mapfileino(dump_ino_t ino, struct dinode const *dp, long *tapesize, int *dirskipped)
+{
+ int mode;
+
+ /*
+ * Skip inode if we've already marked it for dumping
+ */
+ if (TSTINO(ino, usedinomap))
+ return;
+ if (!dp)
+ dp = getino(ino);
+ if ((mode = (dp->di_mode & IFMT)) == 0)
+ return;
+#ifdef __linux__
+ if (dp->di_nlink == 0 || dp->di_dtime != 0)
+ return;
+#endif
+ /*
+ * Put all dirs in dumpdirmap, inodes that are to be dumped in the
+ * used map. All inode but dirs who have the nodump attribute go
+ * to the usedinomap.
+ */
+ SETINO(ino, usedinomap);
+
+ if (mode == IFDIR)
+ SETINO(ino, dumpdirmap);
+ if (WANTTODUMP(dp, ino)) {
+ SETINO(ino, dumpinomap);
+ if (!MSINCE(dp, spcl.c_ddate))
+ SETINO(ino, metainomap);
+ if (mode != IFREG && mode != IFDIR && mode != IFLNK)
+ *tapesize += 1;
+ else
+ *tapesize += blockest(dp);
+ return;
+ }
+ if (mode == IFDIR) {
+ if ( NODUMP_FLAG(dp) || exclude_ino(ino) )
+ CLRINO(ino, usedinomap);
+ *dirskipped = 1;
+ }
+}
+
/*
* Dump pass 1.
*
* that have been modified since the previous dump time. Also, find all
* the directories in the filesystem.
*/
+#ifdef __linux__
int
-mapfiles(ino_t maxino, long *tapesize)
+mapfiles(dump_ino_t maxino, long *tapesize)
{
- register int mode;
- register ino_t ino;
- register struct dinode *dp;
+ ext2_ino_t ino;
int anydirskipped = 0;
+ ext2_inode_scan scan;
+ errcode_t err;
+ struct ext2_inode inode;
- for (ino = ROOTINO; ino < maxino; ino++) {
- dp = getino(ino);
- if ((mode = (dp->di_mode & IFMT)) == 0)
- continue;
-#ifdef __linux__
- if (dp->di_nlink == 0 || dp->di_dtime != 0)
- continue;
-#endif
- SETINO(ino, usedinomap);
- if (mode == IFDIR)
- SETINO(ino, dumpdirmap);
- if (WANTTODUMP(dp)) {
- SETINO(ino, dumpinomap);
- if (mode != IFREG && mode != IFDIR && mode != IFLNK)
- *tapesize += 1;
- else
- *tapesize += blockest(dp);
+ /*
+ * We use libext2fs's inode scanning routines, which are particularly
+ * robust. (Note that getino cannot return an error.)
+ */
+ err = ext2fs_open_inode_scan(fs, 0, &scan);
+ if (err) {
+ com_err(disk, err, "while opening inodes\n");
+ exit(X_ABORT);
+ }
+ for (;;) {
+ err = ext2fs_get_next_inode(scan, &ino, &inode);
+ if (err == EXT2_ET_BAD_BLOCK_IN_INODE_TABLE)
continue;
+ if (err) {
+ com_err(disk, err, "while scanning inode #%ld\n",
+ (long)ino);
+ exit(X_ABORT);
}
- if (mode == IFDIR)
- anydirskipped = 1;
+ if (ino == 0)
+ break;
+
+ curino = ino;
+ mapfileino(ino, (struct dinode const *)&inode, tapesize,
+ &anydirskipped);
}
+ ext2fs_close_inode_scan(scan);
+
+ /*
+ * Restore gets very upset if the root is not dumped,
+ * so ensure that it always is dumped.
+ */
+ SETINO(ROOTINO, dumpinomap);
+ return (anydirskipped);
+}
+#else
+int
+mapfiles(dump_ino_t maxino, long *tapesize)
+{
+ dump_ino_t ino;
+ int anydirskipped = 0;
+
+ for (ino = ROOTINO; ino < maxino; ino++)
+ mapfileino(ino, tapesize, &anydirskipped);
+
/*
* Restore gets very upset if the root is not dumped,
* so ensure that it always is dumped.
SETINO(ROOTINO, dumpinomap);
return (anydirskipped);
}
+#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;
- int anydirskipped;
+ int *anydirskipped;
};
static int
mapfilesindir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private)
{
- register struct dinode *dp;
- register int mode;
- ino_t ino;
+ struct dinode const *dp;
+ int mode;
errcode_t retval;
struct mapfile_context *mfc;
+ ext2_ino_t ino;
ino = dirent->inode;
mfc = (struct mapfile_context *)private;
- dp = getino(ino);
- if ((mode = (dp->di_mode & IFMT)) != 0 &&
- dp->di_nlink != 0 && dp->di_dtime == 0) {
- SETINO(ino, usedinomap);
- if (mode == IFDIR)
- SETINO(ino, dumpdirmap);
- if (WANTTODUMP(dp)) {
- SETINO(ino, dumpinomap);
- if (mode != IFREG && mode != IFDIR && mode != IFLNK)
- *mfc->tapesize += 1;
- else
- *mfc->tapesize += blockest(dp);
- }
- if (mode == IFDIR) {
- mfc->anydirskipped = 1;
- if ((dirent->name[0] != '.' || dirent->name_len != 1) &&
- (dirent->name[0] != '.' || dirent->name[1] != '.' ||
- dirent->name_len != 2)) {
- retval = ext2fs_dir_iterate(fs, ino, 0, NULL,
- mapfilesindir, private);
- if (retval)
- return retval;
- }
+ dp = getino(dirent->inode);
+
+ mapfileino(dirent->inode, dp, mfc->tapesize, mfc->anydirskipped);
+
+ mode = dp->di_mode & IFMT;
+ if (mode == IFDIR && dp->di_nlink != 0 && dp->di_dtime == 0) {
+ if ((dirent->name[0] != '.' || ( dirent->name_len & 0xFF ) != 1) &&
+ (dirent->name[0] != '.' || dirent->name[1] != '.' ||
+ ( dirent->name_len & 0xFF ) != 2)) {
+ retval = ext2fs_dir_iterate(fs, ino, 0, NULL,
+ mapfilesindir, private);
+ if (retval)
+ return retval;
}
}
return 0;
* 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;
- ino_t dir_ino;
+ ext2_ino_t dir_ino;
char dir_name [MAXPATHLEN];
- int i;
+ int i, anydirskipped = 0;
/*
* Mark every directory in the path as being dumped
dir_name);
exit(X_ABORT);
}
-/* SETINO(dir_ino, dumpinomap); */
- SETINO(dir_ino, dumpdirmap);
+ mapfileino(dir_ino, 0, tapesize, &anydirskipped);
}
}
/*
com_err(disk, retval, "while translating %s", directory);
exit(X_ABORT);
}
-/* SETINO(dir_ino, dumpinomap); */
- SETINO(dir_ino, dumpdirmap);
+ mapfileino(dir_ino, 0, tapesize, &anydirskipped);
mfc.tapesize = tapesize;
- mfc.anydirskipped = 0;
+ mfc.anydirskipped = &anydirskipped;
retval = ext2fs_dir_iterate(fs, dir_ino, 0, NULL, mapfilesindir,
(void *)&mfc);
com_err(disk, retval, "while mapping files in %s", directory);
exit(X_ABORT);
}
+ /*
+ * Ensure that the root inode actually appears in the file list
+ * for a subdir
+ */
+ mapfileino(ROOTINO, 0, tapesize, &anydirskipped);
/*
* Restore gets very upset if the root is not dumped,
* so ensure that it always is dumped.
*/
-/* SETINO(ROOTINO, dumpinomap); */
- SETINO(ROOTINO, dumpdirmap);
- return (mfc.anydirskipped);
+ SETINO(ROOTINO, dumpinomap);
+ return anydirskipped;
}
#endif
+#ifdef __linux__
+struct mapdirs_context {
+ int *ret;
+ int nodump;
+ long *tapesize;
+};
+#endif
+
/*
* Dump pass 2.
*
* 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;
+ 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;
#endif
- int ret, change = 0;
+ int ret, change = 0, nodump;
isdir = 0; /* XXX just to get gcc to shut up */
for (map = dumpdirmap, ino = 1; ino < maxino; ino++) {
isdir = *map++;
else
isdir >>= 1;
- if ((isdir & 1) == 0 || TSTINO(ino, dumpinomap))
+ /*
+ * If dir has been removed from the used map, it's either
+ * because it had the nodump flag, or it herited it from
+ * its parent. A directory can't be in dumpinomap if not
+ * in usedinomap, but we have to go through it anyway
+ * to propagate the nodump attribute.
+ */
+ nodump = (TSTINO(ino, usedinomap) == 0);
+ if ((isdir & 1) == 0 ||
+ (TSTINO(ino, dumpinomap) && nodump == 0))
continue;
dp = getino(ino);
#ifdef __linux__
ret = 0;
- ext2fs_dir_iterate(fs, ino, 0, NULL, searchdir, (void *) &ret);
+ mdc.ret = &ret;
+ mdc.nodump = nodump;
+ mdc.tapesize = tapesize;
+ ext2fs_dir_iterate(fs, ino, 0, NULL, searchdir, (void *) &mdc);
#else /* __linux__ */
filesize = dp->di_size;
for (ret = 0, i = 0; filesize > 0 && i < NDADDR; i++) {
change = 1;
continue;
}
- if ((ret & HASSUBDIRS) == 0) {
+ if (nodump) {
+ if (ret & HASSUBDIRS)
+ change = 1; /* subdirs have inherited nodump */
+ CLRINO(ino, dumpdirmap);
+ } else if ((ret & HASSUBDIRS) == 0) {
if (!TSTINO(ino, dumpinomap)) {
CLRINO(ino, dumpdirmap);
change = 1;
* 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;
+ int i;
daddr_t idblk[MAXNINDIR];
bread(fsbtodb(sblock, blkno), (char *)idblk, (int)sblock->fs_bsize);
static int
searchdir(struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void *private)
{
- int *ret = (int *) private;
+ struct mapdirs_context *mdc;
+ int *ret;
+ long *tapesize;
+ struct dinode *ip;
+
+ mdc = (struct mapdirs_context *)private;
+ ret = mdc->ret;
+ tapesize = mdc->tapesize;
if (dp->inode == 0)
return 0;
if (dp->name[0] == '.') {
- if (dp->name_len == 1)
+ if (( dp->name_len & 0xFF ) == 1)
return 0;
- if (dp->name[1] == '.' && dp->name_len == 2)
+ if (dp->name[1] == '.' && ( dp->name_len & 0xFF ) == 2)
return 0;
}
- if (TSTINO(dp->inode, dumpinomap)) {
- *ret |= HASDUMPEDFILE;
- if (*ret & HASSUBDIRS)
- return DIRENT_ABORT;
- }
- if (TSTINO(dp->inode, dumpdirmap)) {
- *ret |= HASSUBDIRS;
- if (*ret & HASDUMPEDFILE)
- return DIRENT_ABORT;
+ if (mdc->nodump) {
+ ip = getino(dp->inode);
+ if (TSTINO(dp->inode, dumpinomap)) {
+ CLRINO(dp->inode, dumpinomap);
+ CLRINO(dp->inode, usedinomap);
+ *tapesize -= blockest(ip);
+ }
+ /* Add dir back to the dir map, to propagate nodump */
+ if ((ip->di_mode & IFMT) == IFDIR) {
+ SETINO(dp->inode, dumpdirmap);
+ *ret |= HASSUBDIRS;
+ }
+ } else {
+ if (TSTINO(dp->inode, dumpinomap)) {
+ *ret |= HASDUMPEDFILE;
+ if (*ret & HASSUBDIRS)
+ return DIRENT_ABORT;
+ }
+ if (TSTINO(dp->inode, dumpdirmap)) {
+ *ret |= HASSUBDIRS;
+ if (*ret & HASDUMPEDFILE)
+ return DIRENT_ABORT;
+ }
}
return 0;
}
#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;
+ struct direct *dp;
+ long loc, ret = 0;
char dblk[MAXBSIZE];
bread(fsbtodb(sblock, blkno), dblk, (int)size);
#ifdef __linux__
struct block_context {
- ino_t ino;
+ ext2_ino_t ino;
int *buf;
int cnt;
int max;
* Dump a block to the tape
*/
static int
-dumponeblock(ext2_filsys fs, blk_t *blocknr, int blockcnt, void *private)
+dumponeblock(ext2_filsys fs, blk_t *blocknr, e2_blkcnt_t blockcnt,
+ blk_t ref_block, int ref_offset, void * private)
{
struct block_context *p;
int i;
* Dump the contents of an inode to tape.
*/
void
-dumpino(struct dinode *dp, ino_t ino)
+dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
{
- int cnt;
- fsizeT size;
+ unsigned long cnt;
+ fsizeT size, remaining;
char buf[TP_BSIZE];
struct old_bsd_inode obi;
+ int i;
#ifdef __linux__
struct block_context bc;
#else
int ind_level;
#endif
+ u_quad_t i_size;
+
+ if (metaonly)
+ i_size = 0;
+ else
+ i_size = dp->di_size + ((u_quad_t) dp->di_size_high << 32);
if (newtape) {
newtape = 0;
obi.di_mode = dp->di_mode;
obi.di_uid = dp->di_uid;
obi.di_gid = dp->di_gid;
- obi.di_qsize.v = (u_quad_t)dp->di_size;
+ obi.di_qsize.v = i_size;
obi.di_atime = dp->di_atime;
obi.di_mtime = dp->di_mtime;
obi.di_ctime = dp->di_ctime;
obi.di_flags = dp->di_flags;
obi.di_gen = dp->di_gen;
memmove(&obi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
- if (dp->di_file_acl || dp->di_dir_acl)
- warn("ACLs in inode #%ld won't be dumped", ino);
+ if (dp->di_file_acl)
+ warn("ACLs in inode #%ld won't be dumped", (long)ino);
memmove(&spcl.c_dinode, &obi, sizeof(obi));
#else /* __linux__ */
spcl.c_dinode = *dp;
#endif /* __linux__ */
spcl.c_type = TS_INODE;
spcl.c_count = 0;
+
+ if (metaonly && (dp->di_mode & S_IFMT)) {
+ spcl.c_flags |= DR_METAONLY;
+ spcl.c_count = 0;
+ writeheader(ino);
+ spcl.c_flags &= ~DR_METAONLY;
+ return;
+ }
+
switch (dp->di_mode & S_IFMT) {
case 0:
* Check for short symbolic link.
*/
#ifdef __linux__
- if (dp->di_size > 0 &&
- dp->di_size < EXT2_N_BLOCKS * sizeof (daddr_t)) {
+ if (i_size > 0 &&
+ i_size < EXT2_N_BLOCKS * sizeof (daddr_t)) {
spcl.c_addr[0] = 1;
spcl.c_count = 1;
writeheader(ino);
case S_IFDIR:
#endif
case S_IFREG:
- if (dp->di_size > 0)
+ if (i_size)
break;
/* fall through */
msg("Warning: undefined file type 0%o\n", dp->di_mode & IFMT);
return;
}
- if (dp->di_size > NDADDR * sblock->fs_bsize)
+ if (i_size > NDADDR * sblock->fs_bsize)
#ifdef __linux__
cnt = NDADDR * EXT2_FRAGS_PER_BLOCK(fs->super);
#else
cnt = NDADDR * sblock->fs_frag;
#endif
else
- cnt = howmany(dp->di_size, sblock->fs_fsize);
+ cnt = howmany(i_size, sblock->fs_fsize);
blksout(&dp->di_db[0], cnt, ino);
- if ((size = dp->di_size - NDADDR * sblock->fs_bsize) <= 0)
+ if ((quad_t) (size = i_size - NDADDR * sblock->fs_bsize) <= 0)
return;
#ifdef __linux__
bc.max = NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super);
bc.ino = ino;
bc.next_block = NDADDR;
- ext2fs_block_iterate (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);
}
+ free(bc.buf);
#else
for (ind_level = 0; ind_level < NIADDR; ind_level++) {
dmpindir(ino, dp->di_ib[ind_level], ind_level, &size);
convert_dir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private)
{
struct convert_dir_context *p;
- struct direct *dp;
+ struct olddirect *dp;
int reclen;
p = (struct convert_dir_context *)private;
- reclen = EXT2_DIR_REC_LEN(dirent->name_len + 1);
+ reclen = EXT2_DIR_REC_LEN((dirent->name_len & 0xFF) + 1);
if (((p->offset + reclen - 1) / p->bs) != (p->offset / p->bs)) {
- dp = (struct direct *)(p->buf + p->prev_offset);
+ dp = (struct olddirect *)(p->buf + p->prev_offset);
dp->d_reclen += p->bs - (p->offset % p->bs);
p->offset += p->bs - (p->offset % p->bs);
}
- dp = (struct direct *)(p->buf + p->offset);
+ dp = (struct olddirect *)(p->buf + p->offset);
dp->d_ino = dirent->inode;
dp->d_reclen = reclen;
- dp->d_type = 0;
- dp->d_namlen = dirent->name_len;
- strncpy(dp->d_name, dirent->name, dirent->name_len);
+ dp->d_namlen = dirent->name_len & 0xFF;
+ strncpy(dp->d_name, dirent->name, dp->d_namlen);
dp->d_name[dp->d_namlen] = '\0';
p->prev_offset = p->offset;
p->offset += reclen;
* 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];
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", ino);
+ com_err(disk, retval, "while converting directory #%ld\n", (long)ino);
exit(X_ABORT);
}
/* Fix the last entry */
obi.di_flags = dp->di_flags;
obi.di_gen = dp->di_gen;
memmove(&obi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
- if (dp->di_file_acl || dp->di_dir_acl)
- warn("ACLs in inode #%ld won't be dumped", ino);
+ if (dp->di_file_acl)
+ warn("ACLs in inode #%ld won't be dumped", (long)ino);
memmove(&spcl.c_dinode, &obi, sizeof(obi));
#else /* __linux__ */
spcl.c_dinode = *dp;
* 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__
*/
#if defined(EXT2_FLAG_SWAP_BYTES)
if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
- (fs->flags & EXT2_FLAG_SWAP_BYTES_READ)) {
+ (fs->flags & EXT2_FLAG_SWAP_BYTES_READ))
#endif
+ {
max = sblock->fs_bsize >> 2;
swapme = (blk_t *) idblk;
for (i = 0; i < max; i++, swapme++)
- *swapme = swab32(*swapme);
-#if defined(EXT2_FLAG_SWAP_BYTES)
+ *swapme = ext2fs_swab32(*swapme);
}
-#endif
-#endif
+#endif /* __linux__ */
else
memset(idblk, 0, (int)sblock->fs_bsize);
if (ind_level <= 0) {
* 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;
+ daddr_t *bp;
int i, j, count, blks, tbperdb;
blks = howmany(frags * sblock->fs_fsize, TP_BSIZE);
* 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;
+ 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(ino_t ino)
+mkchecksum(union u_spcl *tmpspcl)
{
-#ifdef __linux__
- register __s32 sum, cnt, *lp;
-#else
- register int32_t sum, cnt, *lp;
-#endif
+ int32_t sum, cnt, *lp;
- spcl.c_inumber = ino;
- spcl.c_magic = NFS_MAGIC;
- spcl.c_checksum = 0;
-#ifdef __linux__
- lp = (__s32 *)&spcl;
-#else
- lp = (int32_t *)&spcl;
-#endif
+ tmpspcl->s_spcl.c_checksum = 0;
+ lp = (int32_t *)&tmpspcl->s_spcl;
sum = 0;
-#ifdef __linux__
- cnt = sizeof(union u_spcl) / (4 * sizeof(__s32));
-#else
cnt = sizeof(union u_spcl) / (4 * sizeof(int32_t));
-#endif
while (--cnt >= 0) {
sum += *lp++;
sum += *lp++;
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;
- 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);
+ }
return &dinode;
}
#else /* __linux__ */
struct dinode *
-getino(ino_t inum)
+getino(dump_ino_t inum)
{
static daddr_t minino, maxino;
static struct dinode inoblock[MAXINOPB];
/*
* 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)
loop:
#ifdef __linux__
- if (llseek(diskfd, ((ext2_loff_t)blkno << dev_bshift), 0) !=
- ((ext2_loff_t)blkno << dev_bshift))
+ if (ext2fs_llseek(diskfd, (((ext2_loff_t)blkno) << dev_bshift), 0) !=
+ (((ext2_loff_t)blkno) << dev_bshift))
#else
if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) !=
((off_t)blkno << dev_bshift))
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?")){
memset(buf, 0, size);
for (i = 0; i < size; i += dev_bsize, buf += dev_bsize, blkno++) {
#ifdef __linux__
- if (llseek(diskfd, ((ext2_loff_t)blkno << dev_bshift), 0) !=
- ((ext2_loff_t)blkno << dev_bshift))
+ if (ext2fs_llseek(diskfd, (((ext2_loff_t)blkno) << dev_bshift), 0) !=
+ (((ext2_loff_t)blkno) << dev_bshift))
#else
if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) !=
((off_t)blkno << dev_bshift))