diff options
author | phk <phk@FreeBSD.org> | 2002-07-30 20:49:29 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2002-07-30 20:49:29 +0000 |
commit | 1c53888a98cc850fbf78f978d11f285895a092df (patch) | |
tree | c75855d118202b3deccf42bc34a33e7d0fc665d7 | |
parent | 14df04dfafe3bdfd29934b3e7c1dd5e6c91bb260 (diff) | |
download | FreeBSD-src-1c53888a98cc850fbf78f978d11f285895a092df.zip FreeBSD-src-1c53888a98cc850fbf78f978d11f285895a092df.tar.gz |
Remove some additional paranoia which Kirk forgot to remove from his
UFS2 commit.
These bits in essence made any instance of "softupdates expected
corrution", (ie blocks marked allocated but not referenced by an
inode etc) result in a exit value for fsck_ffs of 2.
2 is part of the magic and appearantly undocumented protocol between
fsck_FOO and fsck and means "dump into single user mode ASAP.
Sponsored by: DARPA & NAI Labs.
-rw-r--r-- | sbin/fsck_ffs/Makefile | 3 | ||||
-rw-r--r-- | sbin/fsck_ffs/pass5.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sbin/fsck_ffs/Makefile b/sbin/fsck_ffs/Makefile index 94417f9..8977b3d 100644 --- a/sbin/fsck_ffs/Makefile +++ b/sbin/fsck_ffs/Makefile @@ -7,7 +7,8 @@ LINKS+= ${BINDIR}/fsck_ffs ${BINDIR}/fsck_4.2bsd MAN= fsck_ffs.8 SRCS= dir.c fsutil.c inode.c main.c pass1.c pass1b.c pass2.c pass3.c pass4.c \ pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c -WARNS= 0 +WARNS= 2 +CFLAGS+= -I${.CURDIR} .PATH: ${.CURDIR}/../../sys/ufs/ffs diff --git a/sbin/fsck_ffs/pass5.c b/sbin/fsck_ffs/pass5.c index d11008e..1d81d05 100644 --- a/sbin/fsck_ffs/pass5.c +++ b/sbin/fsck_ffs/pass5.c @@ -382,7 +382,6 @@ check_maps( aend = n; continue; } - returntosingle = 1; if (astart == aend) (*msg)("ALLOCATED %s %d MARKED FREE\n", name, astart); @@ -419,7 +418,6 @@ check_maps( pwarn("%s %sS %d-%ld MARKED USED\n", "UNALLOCATED", name, ustart, ustart + size - 1); - returntosingle = 1; if (bkgrdflag != 0) { cmd.value = ustart; cmd.size = size; @@ -462,7 +460,6 @@ check_maps( pwarn("UNALLOCATED %sS %d-%ld MARKED USED\n", name, ustart, ustart + size - 1); } - returntosingle = 1; if (bkgrdflag != 0) { cmd.value = ustart; cmd.size = size; |