aboutsummaryrefslogtreecommitdiff
path: root/sbin/fsck_ffs
diff options
context:
space:
mode:
authorIan Dowse <iedowse@FreeBSD.org>2001-05-29 20:45:08 +0000
committerIan Dowse <iedowse@FreeBSD.org>2001-05-29 20:45:08 +0000
commite23faa1027eced1f412e612535295ca629af10c8 (patch)
tree7781462a9b7d568449324e7de6a1975991dae0cc /sbin/fsck_ffs
parent753d49786eca6cdde17034529715a4d1770277b0 (diff)
downloadsrc-e23faa1027eced1f412e612535295ca629af10c8.tar.gz
src-e23faa1027eced1f412e612535295ca629af10c8.zip
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.
Notes
Notes: svn path=/head/; revision=77436
Diffstat (limited to 'sbin/fsck_ffs')
-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 24ef003eeea4..581e77ae5438 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);