* 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 <pop@cybercable.fr>, 1999
*/
/*-
*/
#ifndef lint
-#if 0
-static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95";
-#endif
static const char rcsid[] =
- "$Id: traverse.c,v 1.4 1999/10/11 13:08:08 stelian Exp $";
+ "$Id: traverse.c,v 1.12 2000/01/09 23:47:33 tiniou Exp $";
#endif /* not lint */
#include <sys/param.h>
#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));
#endif
+static void mapfileino __P((ino_t ino, long *tapesize, int *dirskipped));
+
+/* #define EXT3_FEATURE_INCOMPAT_RECOVER */
+
+int dump_fs_open(const char *disk, ext2_filsys *fs)
+{
+ int retval;
+ struct ext2fs_sb *s;
+
+#ifdef EXT3_FEATURE_INCOMPAT_RECOVER
+ retval = ext2fs_open(disk, EXT2_FLAG_FORCE, 0, 0, unix_io_manager, fs);
+#else
+ retval = ext2fs_open(disk, 0, 0, 0, unix_io_manager, fs);
+#endif
+ if (!retval) {
+ s = (struct ext2fs_sb *) (*fs)->super;
+ if ((s->s_feature_compat & ~EXT2_LIB_FEATURE_COMPAT_SUPP) ||
+#ifdef EXT3_FEATURE_INCOMPAT_RECOVER
+ (s->s_feature_incompat & ~(EXT3_FEATURE_INCOMPAT_RECOVER | EXT2_LIB_FEATURE_INCOMPAT_SUPP))) {
+#else
+ (s->s_feature_incompat & ~EXT2_LIB_FEATURE_INCOMPAT_SUPP)) {
+#endif
+ retval = EXT2_ET_UNSUPP_FEATURE;
+ }
+ else if (s->s_feature_ro_compat & ~EXT2_LIB_FEATURE_RO_COMPAT_SUPP) {
+ retval = EXT2_ET_RO_UNSUPP_FEATURE;
+ }
+ }
+ return retval;
+}
/*
* This is an estimation of the number of TP_BSIZE blocks in the file.
#define WANTTODUMP(dp) CHANGEDSINCE(dp, spcl.c_ddate)
#endif
+/*
+ * Determine if given inode should be dumped
+ */
+void
+mapfileino(ino_t ino, long *tapesize, int *dirskipped)
+{
+ register int mode;
+ register struct dinode *dp;
+
+ /*
+ * Skip inode if we've already marked it for dumping
+ */
+ if (TSTINO(ino, usedinomap))
+ return;
+ 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)) {
+ SETINO(ino, dumpinomap);
+ if (mode != IFREG && mode != IFDIR && mode != IFLNK)
+ *tapesize += 1;
+ else
+ *tapesize += blockest(dp);
+ return;
+ }
+ if (mode == IFDIR) {
+#ifdef UF_NODUMP
+ if (!nonodump && (dp->di_flags & UF_NODUMP))
+ CLRINO(ino, usedinomap);
+#endif
+ *dirskipped = 1;
+ }
+}
+
/*
* Dump pass 1.
*
int
mapfiles(ino_t maxino, long *tapesize)
{
- register int mode;
register ino_t ino;
- register struct dinode *dp;
int anydirskipped = 0;
- 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);
- continue;
- }
- if (mode == IFDIR)
- anydirskipped = 1;
- }
+ 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.
#ifdef __linux__
struct mapfile_context {
long *tapesize;
- int anydirskipped;
+ int *anydirskipped;
};
static int
{
register struct dinode *dp;
register int mode;
- ino_t ino;
errcode_t retval;
struct mapfile_context *mfc;
+ 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;
- }
+
+ mapfileino(dirent->inode, mfc->tapesize, mfc->anydirskipped);
+
+ dp = getino(dirent->inode);
+ 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;
struct mapfile_context mfc;
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, tapesize, &anydirskipped);
}
}
/*
com_err(disk, retval, "while translating %s", directory);
exit(X_ABORT);
}
-/* SETINO(dir_ino, dumpinomap); */
- SETINO(dir_ino, dumpdirmap);
+ mapfileino(dir_ino, 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, 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.
*
#ifndef __linux__
register 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;
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;
}
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);
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->d_reclen += p->bs - (p->offset % p->bs);
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;
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))
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))
git.wh0rd.org / dump.git / blobdiff