Author: kib
Date: Tue Jun 19 10:04:36 2012
New Revision: 237265
URL: http://svn.freebsd.org/changeset/base/237265
Log:
MFC r236976:
For incompleted block allocations or frees, the inode block count usage
must be recalculated. The blk_check pass of suj checker explicitely marks
inodes which owned such blocks as needing block count adjustment. But
ino_adjblks() is only called by cg_trunc pass, which is performed before
blk_check. As result, the block use count for such inodes is left wrong.
This causes full fsck run after journaled run to still find inconsistencies
like 'INCORRECT BLOCK COUNT I=14557 (328 should be 0)' in phase 1.
Fix this issue by running additional adj_blk pass after blk_check, which
updates the field.
Modified:
stable/9/sbin/fsck_ffs/suj.c
Directory Properties:
stable/9/sbin/fsck_ffs/ (props changed)
Modified: stable/9/sbin/fsck_ffs/suj.c
==============================================================================
--- stable/9/sbin/fsck_ffs/suj.c Tue Jun 19 08:12:44 2012
(r237264)
+++ stable/9/sbin/fsck_ffs/suj.c Tue Jun 19 10:04:36 2012
(r237265)
@@ -1789,6 +1789,20 @@ cg_trunc(struct suj_cg *sc)
}
}
+static void
+cg_adj_blk(struct suj_cg *sc)
+{
+ struct suj_ino *sino;
+ int i;
+
+ for (i = 0; i < SUJ_HASHSIZE; i++) {
+ LIST_FOREACH(sino, &sc->sc_inohash[i], si_next) {
+ if (sino->si_blkadj)
+ ino_adjblks(sino);
+ }
+ }
+}
+
/*
* Free any partially allocated blocks and then resolve inode block
* counts.
@@ -2720,6 +2734,7 @@ suj_check(const char *filesys)
printf("** Processing journal entries.\n");
cg_apply(cg_trunc);
cg_apply(cg_check_blk);
+ cg_apply(cg_adj_blk);
cg_apply(cg_check_ino);
}
if (preen == 0 && (jrecs > 0 || jbytes > 0) && reply("WRITE CHANGES")
== 0)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
