d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some error messages suggested in PR bin/138043. The code to

Browse Source 
correct the problem was added in r176575 by delphij on 2008-02-25.

PR:		138043
Reported by:	Heikki Suonsivu
This commit is contained in:
mckusick 2010-01-07 01:10:49 +00:00
parent 8399082d6d
commit 5d0cfcfe1d
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sbin/fsck_ffs/main.c
View File

@ -406,7 +406,10 @@ checkfilesys(char *filesys)
*/
if (duplist) {
if (preen || usedsoftdep)
pfatal("INTERNAL ERROR: dups with -p");
pfatal("INTERNAL ERROR: dups with %s%s%s",
preen ? "-p" : "",
(preen && usedsoftdep) ? " and " : "",
usedsoftdep ? "softupdates" : "");
printf("** Phase 1b - Rescan For More DUPS\n");
pass1b();
}

10
sbin/fsck_ffs/pass1.c
View File

@ -98,10 +98,16 @@ pass1(void)
rebuildcg = 1;
if (!rebuildcg && sblock.fs_magic == FS_UFS2_MAGIC) {
inosused = cgrp.cg_initediblk;
if (inosused > sblock.fs_ipg)
if (inosused > sblock.fs_ipg) {
pfatal("%s (%d > %d) %s %d\nReset to %d\n",
"Too many initialized inodes", inosused,
sblock.fs_ipg, "in cylinder group", c,
sblock.fs_ipg);
inosused = sblock.fs_ipg;
} else
}
} else {
inosused = sblock.fs_ipg;
}
if (got_siginfo) {
printf("%s: phase 1: cyl group %d of %d (%d%%)\n",
cdevname, c, sblock.fs_ncg,