diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2005-06-16 14:51:38 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2005-06-16 14:51:38 +0000 |
| commit | 8d6ce0c8ae36ad4cb09841969fba84da465b2631 (patch) | |
| tree | 19997a0fda9938e912e38bb03b3d091c00372c73 | |
| parent | d8a7cc8bc2e1588b4e556b7411341500cbedc750 (diff) | |
bye bye whiteouts
| -rw-r--r-- | sbin/fsck_ffs/pass2.c | 16 | ||||
| -rw-r--r-- | sbin/fsck_ffs/pass5.c | 5 |
2 files changed, 4 insertions, 17 deletions
diff --git a/sbin/fsck_ffs/pass2.c b/sbin/fsck_ffs/pass2.c index bec83e18a85..7dea3a583e7 100644 --- a/sbin/fsck_ffs/pass2.c +++ b/sbin/fsck_ffs/pass2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass2.c,v 1.21 2005/04/16 18:15:41 millert Exp $ */ +/* $OpenBSD: pass2.c,v 1.22 2005/06/16 14:51:37 millert Exp $ */ /* $NetBSD: pass2.c,v 1.17 1996/09/27 22:45:15 christos Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pass2.c 8.6 (Berkeley) 10/27/94"; #else -static const char rcsid[] = "$OpenBSD: pass2.c,v 1.21 2005/04/16 18:15:41 millert Exp $"; +static const char rcsid[] = "$OpenBSD: pass2.c,v 1.22 2005/06/16 14:51:37 millert Exp $"; #endif #endif /* not lint */ @@ -138,10 +138,6 @@ pass2(void) errexit("BAD STATE %d FOR ROOT INODE\n", statemap[ROOTINO]); } statemap[ROOTINO] = DFOUND; - if (newinofmt) { - statemap[WINO] = FSTATE; - typemap[WINO] = DT_WHT; - } /* * Sort the directory list into disk block order. */ @@ -422,14 +418,6 @@ chk2: if (dirp->d_ino > maxino) { fileerror(idesc->id_number, dirp->d_ino, "I OUT OF RANGE"); n = reply("REMOVE"); - } else if (newinofmt && - ((dirp->d_ino == WINO && dirp->d_type != DT_WHT) || - (dirp->d_ino != WINO && dirp->d_type == DT_WHT))) { - fileerror(idesc->id_number, dirp->d_ino, "BAD WHITEOUT ENTRY"); - dirp->d_ino = WINO; - dirp->d_type = DT_WHT; - if (reply("FIX") == 1) - ret |= ALTERED; } else { again: switch (statemap[dirp->d_ino]) { diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index 52695763e80..e0061ee1932 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pass5.c,v 1.19 2005/04/16 18:15:41 millert Exp $ */ +/* $OpenBSD: pass5.c,v 1.20 2005/06/16 14:51:37 millert Exp $ */ /* $NetBSD: pass5.c,v 1.16 1996/09/27 22:45:18 christos Exp $ */ /* @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = "@(#)pass5.c 8.6 (Berkeley) 11/30/94"; #else -static const char rcsid[] = "$OpenBSD: pass5.c,v 1.19 2005/04/16 18:15:41 millert Exp $"; +static const char rcsid[] = "$OpenBSD: pass5.c,v 1.20 2005/06/16 14:51:37 millert Exp $"; #endif #endif /* not lint */ @@ -81,7 +81,6 @@ pass5(void) struct cg *newcg = (struct cg *)buf; struct ocg *ocg = (struct ocg *)buf; - statemap[WINO] = USTATE; memset(newcg, 0, (size_t)fs->fs_cgsize); newcg->cg_niblk = fs->fs_ipg; if (cvtlevel >= 3) { |