summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sbin/fsck_ffs/main.c5
-rw-r--r--sbin/fsck_ffs/pass1.c10
2 files changed, 12 insertions, 3 deletions
diff --git a/sbin/fsck_ffs/main.c b/sbin/fsck_ffs/main.c
index 0366e45..66edd63 100644
--- a/sbin/fsck_ffs/main.c
+++ b/sbin/fsck_ffs/main.c
@@ -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();
}
diff --git a/sbin/fsck_ffs/pass1.c b/sbin/fsck_ffs/pass1.c
index 73b6419..fa30bb2 100644
--- a/sbin/fsck_ffs/pass1.c
+++ b/sbin/fsck_ffs/pass1.c
@@ -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,
OpenPOWER on IntegriCloud