Module Name: src
Committed By: dholland
Date: Sat Oct 10 22:34:10 UTC 2015
Modified Files:
src/sbin/fsck_lfs: lfs.c
src/usr.sbin/dumplfs: dumplfs.c
Log Message:
Track down and fix two missing uses of SEGSUM_FINFOBASE().
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.59 -r1.60 src/usr.sbin/dumplfs/dumplfs.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_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.67 src/sbin/fsck_lfs/lfs.c:1.68
--- src/sbin/fsck_lfs/lfs.c:1.67 Sat Oct 3 08:29:48 2015
+++ src/sbin/fsck_lfs/lfs.c Sat Oct 10 22:34:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.67 2015/10/03 08:29:48 dholland Exp $ */
+/* $NetBSD: lfs.c,v 1.68 2015/10/10 22:34:09 dholland Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -791,7 +791,7 @@ check_summary(struct lfs *fs, SEGSUM *sp
iip = iibase;
daddr = pseg_addr + lfs_btofsb(fs, lfs_sb_getsumsize(fs));
- fp = (FINFO *) (sp + 1);
+ fp = SEGSUM_FINFOBASE(fs, sp);
for (i = 0, j = 0;
i < lfs_ss_getnfinfo(fs, sp) || j < howmany(lfs_ss_getninos(fs, sp), LFS_INOPB(fs)); i++) {
if (i >= lfs_ss_getnfinfo(fs, sp) && lfs_ii_getblock(fs, iip) != daddr) {
Index: src/usr.sbin/dumplfs/dumplfs.c
diff -u src/usr.sbin/dumplfs/dumplfs.c:1.59 src/usr.sbin/dumplfs/dumplfs.c:1.60
--- src/usr.sbin/dumplfs/dumplfs.c:1.59 Sat Oct 3 08:28:56 2015
+++ src/usr.sbin/dumplfs/dumplfs.c Sat Oct 10 22:34:09 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dumplfs.c,v 1.59 2015/10/03 08:28:56 dholland Exp $ */
+/* $NetBSD: dumplfs.c,v 1.60 2015/10/10 22:34:09 dholland Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -40,7 +40,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)dumplfs.c 8.5 (Berkeley) 5/24/95";
#else
-__RCSID("$NetBSD: dumplfs.c,v 1.59 2015/10/03 08:28:56 dholland Exp $");
+__RCSID("$NetBSD: dumplfs.c,v 1.60 2015/10/10 22:34:09 dholland Exp $");
#endif
#endif /* not lint */
@@ -622,11 +622,10 @@ dump_sum(int fd, struct lfs *lfsp, SEGSU
* to prevent us from continuing, but it odes merit a warning.)
*/
iip2 = SEGSUM_IINFOSTART(lfsp, sp);
+ fp = SEGSUM_FINFOBASE(lfsp, sp);
if (lfs_sb_getversion(lfsp) == 1) {
- fp = (FINFO *)((SEGSUM_V1 *)sp + 1);
el_size = sizeof(unsigned long);
} else {
- fp = (FINFO *)(sp + 1);
el_size = sizeof(u_int32_t);
}
datap = (char *)malloc(el_size * numblocks);
