diff options
| author | Kirk McKusick <mckusick@FreeBSD.org> | 2000-02-28 20:02:41 +0000 |
|---|---|---|
| committer | Kirk McKusick <mckusick@FreeBSD.org> | 2000-02-28 20:02:41 +0000 |
| commit | e50342e665700ec56c991a125c4c02767dd26006 (patch) | |
| tree | 27ed70030938a3567a89cfbf107b4ce5e4b0ae21 /sbin/fsck_ffs/inode.c | |
| parent | 20fb384ee03f2c0a3cf76289e5cf93adb9e17423 (diff) | |
| download | src-test2-e50342e665700ec56c991a125c4c02767dd26006.tar.gz src-test2-e50342e665700ec56c991a125c4c02767dd26006.zip | |
Yesterday I had to fix a badly broken disk, and found that fsck kept dying:
DIR I=64512 CONNECTED. PARENT WAS I=4032
fsck: cannot find inode 995904
fsdb found the inodes with no problem:
fsdb (inum: 64512)> inode 995904
current inode: directory
I=995904 MODE=40777 SIZE=512
MTIME=Feb 14 15:27:07 2000 [0 nsec]
CTIME=Feb 14 15:27:07 2000 [0 nsec]
ATIME=Feb 24 10:31:58 2000 [0 nsec]
OWNER=nobody GRP=nobody LINKCNT=4 FLAGS=0 BLKCNT=2 GEN=38a41386
Direct blocks: 8094568 0 0 0 0 0 0 0 0 0 0 0
Indirect blocks: 0 0 0
The problem turns out to be a program logic error in fsck. It stores
directory inodes internally in hash lists, using the number of
directories to form the hash key:
inpp = &inphead[inumber % numdirs];
Elsewhere, however, it increments numdirs when it finds unattached
directories. I've made the following fix, which solved the problem in
the case in hand.
Submitted by: Greg Lehey <grog@lemis.com>
Reviewed by: Matthew Dillon <dillon@apollo.backplane.com>
Approved by: Kirk McKusick <mckusick@mckusick.com>
Notes
Notes:
svn path=/head/; revision=57573
Diffstat (limited to 'sbin/fsck_ffs/inode.c')
| -rw-r--r-- | sbin/fsck_ffs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c index 98295be26ed4..dbf86f760f81 100644 --- a/sbin/fsck_ffs/inode.c +++ b/sbin/fsck_ffs/inode.c @@ -396,7 +396,7 @@ cacheino(dp, inumber) malloc(sizeof(*inp) + (blks - 1) * sizeof(ufs_daddr_t)); if (inp == NULL) errx(EEXIT, "cannot increase directory list"); - inpp = &inphead[inumber % numdirs]; + inpp = &inphead[inumber % dirhash]; inp->i_nexthash = *inpp; *inpp = inp; inp->i_parent = inumber == ROOTINO ? ROOTINO : (ino_t)0; @@ -424,7 +424,7 @@ getinoinfo(inumber) { register struct inoinfo *inp; - for (inp = inphead[inumber % numdirs]; inp; inp = inp->i_nexthash) { + for (inp = inphead[inumber % dirhash]; inp; inp = inp->i_nexthash) { if (inp->i_number != inumber) continue; return (inp); |