Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/ufs The oldblks and newblks arrays are used to store dir...



details:   https://anonhg.NetBSD.org/src/rev/a11ebca2f4c8
branches:  trunk
changeset: 542281:a11ebca2f4c8
user:      fvdl <fvdl%NetBSD.org@localhost>
date:      Sat Jan 25 16:40:28 2003 +0000

description:
The oldblks and newblks arrays are used to store direct copies of
on-disk block pointers, so they should be int32_t. Error found
by Izumi Tsutsui.

diffstat:

 sys/ufs/ext2fs/ext2fs_inode.c |  7 ++++---
 sys/ufs/ffs/ffs_inode.c       |  7 ++++---
 sys/ufs/lfs/lfs_inode.c       |  7 ++++---
 3 files changed, 12 insertions(+), 9 deletions(-)

diffs (84 lines):

diff -r 765c38ac16b4 -r a11ebca2f4c8 sys/ufs/ext2fs/ext2fs_inode.c
--- a/sys/ufs/ext2fs/ext2fs_inode.c     Sat Jan 25 15:43:11 2003 +0000
+++ b/sys/ufs/ext2fs/ext2fs_inode.c     Sat Jan 25 16:40:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ext2fs_inode.c,v 1.29 2003/01/24 21:55:20 fvdl Exp $   */
+/*     $NetBSD: ext2fs_inode.c,v 1.30 2003/01/25 16:40:28 fvdl Exp $   */
 
 /*
  * Copyright (c) 1997 Manuel Bouyer.
@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_inode.c,v 1.29 2003/01/24 21:55:20 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_inode.c,v 1.30 2003/01/25 16:40:28 fvdl Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -193,7 +193,8 @@
        daddr_t lastblock;
        struct inode *oip;
        daddr_t bn, lastiblock[NIADDR], indir_lbn[NIADDR];
-       daddr_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR];
+       /* XXX ondisk32 */
+       int32_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR];
        off_t length = ap->a_length;
        struct m_ext2fs *fs;
        int offset, size, level;
diff -r 765c38ac16b4 -r a11ebca2f4c8 sys/ufs/ffs/ffs_inode.c
--- a/sys/ufs/ffs/ffs_inode.c   Sat Jan 25 15:43:11 2003 +0000
+++ b/sys/ufs/ffs/ffs_inode.c   Sat Jan 25 16:40:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_inode.c,v 1.53 2003/01/24 21:55:22 fvdl Exp $      */
+/*     $NetBSD: ffs_inode.c,v 1.54 2003/01/25 16:40:29 fvdl Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_inode.c,v 1.53 2003/01/24 21:55:22 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_inode.c,v 1.54 2003/01/25 16:40:29 fvdl Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -175,7 +175,8 @@
        daddr_t lastblock;
        struct inode *oip;
        daddr_t bn, lastiblock[NIADDR], indir_lbn[NIADDR];
-       daddr_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR];
+       /* XXX ondisk32 */
+       int32_t oldblks[NDADDR + NIADDR], newblks[NDADDR + NIADDR];
        off_t length = ap->a_length;
        struct fs *fs;
        int offset, size, level;
diff -r 765c38ac16b4 -r a11ebca2f4c8 sys/ufs/lfs/lfs_inode.c
--- a/sys/ufs/lfs/lfs_inode.c   Sat Jan 25 15:43:11 2003 +0000
+++ b/sys/ufs/lfs/lfs_inode.c   Sat Jan 25 16:40:28 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_inode.c,v 1.62 2003/01/24 21:55:27 fvdl Exp $      */
+/*     $NetBSD: lfs_inode.c,v 1.63 2003/01/25 16:40:29 fvdl Exp $      */
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.62 2003/01/24 21:55:27 fvdl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_inode.c,v 1.63 2003/01/25 16:40:29 fvdl Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_quota.h"
@@ -234,7 +234,8 @@
        daddr_t lastblock;
        struct inode *oip;
        daddr_t bn, lbn, lastiblock[NIADDR], indir_lbn[NIADDR];
-       daddr_t newblks[NDADDR + NIADDR];
+       /* XXX ondisk32 */
+       int32_t newblks[NDADDR + NIADDR];
        off_t length = ap->a_length;
        struct lfs *fs;
        struct buf *bp;



Home | Main Index | Thread Index | Old Index