summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoriedowse <iedowse@FreeBSD.org>2001-05-29 20:45:08 +0000
committeriedowse <iedowse@FreeBSD.org>2001-05-29 20:45:08 +0000
commit650a04f5d6f114cbbcdf24f7393f92192668d512 (patch)
treee0606a9ed67d64cc34f5a4bf095f2fbe13d0249f
parent9dfeaf738ee5fa7b38ea4495076dc6c073ca94cc (diff)
downloadFreeBSD-src-650a04f5d6f114cbbcdf24f7393f92192668d512.zip
FreeBSD-src-650a04f5d6f114cbbcdf24f7393f92192668d512.tar.gz
Ignore the new superblock fields fs_pendingblocks and fs_pendinginodes
when comparing with the alternate superblock. These fields are used for temporary in-core information only. This should fix the "VALUES IN SUPER BLOCK DISAGREE WITH THOSE IN FIRST ALTERNATE" error from fsck_ffs that has been seen a lot recently.
-rw-r--r--sbin/fsck_ffs/setup.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index 24ef003..581e77a 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -421,6 +421,8 @@ readsb(listerr)
altsblock.fs_contigdirs = sblock.fs_contigdirs;
altsblock.fs_avgfilesize = sblock.fs_avgfilesize;
altsblock.fs_avgfpdir = sblock.fs_avgfpdir;
+ altsblock.fs_pendingblocks = sblock.fs_pendingblocks;
+ altsblock.fs_pendinginodes = sblock.fs_pendinginodes;
memmove(altsblock.fs_fsmnt, sblock.fs_fsmnt, sizeof sblock.fs_fsmnt);
memmove(altsblock.fs_snapinum, sblock.fs_snapinum,
sizeof sblock.fs_snapinum);
OpenPOWER on IntegriCloud