diff options
| author | mckusick <mckusick@FreeBSD.org> | 2010-01-07 01:10:49 +0000 |
|---|---|---|
| committer | mckusick <mckusick@FreeBSD.org> | 2010-01-07 01:10:49 +0000 |
| commit | 5d0cfcfe1ddc88db5f4d35bf5376a4c8d2147efc (patch) | |
| tree | 6a93f89d2eaf9a30750d3cabda2557cf2e4cb111 /sbin/fsck_ffs | |
| parent | 8399082d6d51d51e281d46f674bc47cb8cdcc08f (diff) | |
| download | FreeBSD-src-5d0cfcfe1ddc88db5f4d35bf5376a4c8d2147efc.zip FreeBSD-src-5d0cfcfe1ddc88db5f4d35bf5376a4c8d2147efc.tar.gz | |
Add some error messages suggested in PR bin/138043. The code to
correct the problem was added in r176575 by delphij on 2008-02-25.
PR: 138043
Reported by: Heikki Suonsivu
Diffstat (limited to 'sbin/fsck_ffs')
| -rw-r--r-- | sbin/fsck_ffs/main.c | 5 | ||||
| -rw-r--r-- | sbin/fsck_ffs/pass1.c | 10 |
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, |
