Module Name: src
Committed By: riz
Date: Tue Dec 17 22:33:39 UTC 2013
Modified Files:
src/sbin/fsck_ffs [netbsd-6-0]: inode.c
Log Message:
Pull up following revision(s) (requested by bouyer in ticket #991):
sbin/fsck_ffs/inode.c: revision 1.70
Fix pasto in the !ufs2 case (use dp->dp1 and not of dp->dp2).
This would be a problem only when allocating a new data block and the
indir block is already allocated, which explains why automated tests didn't
find it.
Problem reported on tech-kern@ and fix tested by manu@.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.64.12.1 src/sbin/fsck_ffs/inode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_ffs/inode.c
diff -u src/sbin/fsck_ffs/inode.c:1.64 src/sbin/fsck_ffs/inode.c:1.64.12.1
--- src/sbin/fsck_ffs/inode.c:1.64 Sun Mar 6 17:08:16 2011
+++ src/sbin/fsck_ffs/inode.c Tue Dec 17 22:33:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: inode.c,v 1.64 2011/03/06 17:08:16 bouyer Exp $ */
+/* $NetBSD: inode.c,v 1.64.12.1 2013/12/17 22:33:39 riz Exp $ */
/*
* Copyright (c) 1980, 1986, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)inode.c 8.8 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: inode.c,v 1.64 2011/03/06 17:08:16 bouyer Exp $");
+__RCSID("$NetBSD: inode.c,v 1.64.12.1 2013/12/17 22:33:39 riz Exp $");
#endif
#endif /* not lint */
@@ -993,7 +993,7 @@ expandfile(union dinode *dp)
dp->dp1.di_ib[ilevel - 1] = iswap32(newblk);
} else {
ibp = getdatablk(is_ufs2 ? iswap64(dp->dp2.di_ib[ilevel - 1]) :
- iswap32(dp->dp2.di_ib[ilevel - 1]), sblock->fs_bsize);
+ iswap32(dp->dp1.di_ib[ilevel - 1]), sblock->fs_bsize);
}
/* walk indirect blocks up to the data block */
for (; ilevel >0 ; ilevel--) {
