[src/trunk]: src/sys/ufs/lfs lfs_cleanint[] in the in-memory superblock needs...

[dholland <dholland%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7b4a8de2f589
branches:  trunk
changeset: 809808:7b4a8de2f589
user:      dholland <dholland%NetBSD.org@localhost>
date:      Sun Aug 02 18:12:59 2015 +0000

description:
lfs_cleanint[] in the in-memory superblock needs to have 64-bit entries.

diffstat:

 sys/ufs/lfs/lfs.h       |  4 ++--
 sys/ufs/lfs/lfs_vnops.c |  6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (45 lines):

diff -r 11e425c9e52a -r 7b4a8de2f589 sys/ufs/lfs/lfs.h
--- a/sys/ufs/lfs/lfs.h Sun Aug 02 18:12:41 2015 +0000
+++ b/sys/ufs/lfs/lfs.h Sun Aug 02 18:12:59 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs.h,v 1.169 2015/08/02 18:10:08 dholland Exp $       */
+/*     $NetBSD: lfs.h,v 1.170 2015/08/02 18:12:59 dholland Exp $       */
 
 /*  from NetBSD: dinode.h,v 1.22 2013/01/22 09:39:18 dholland Exp  */
 /*  from NetBSD: dir.h,v 1.21 2009/07/22 04:49:19 dholland Exp  */
@@ -721,7 +721,7 @@
        struct pool lfs_segpool;        /* Pool for struct segment */
 #endif /* _KERNEL */
 #define LFS_MAX_CLEANIND 64
-       int32_t  lfs_cleanint[LFS_MAX_CLEANIND]; /* Active cleaning intervals */
+       daddr_t  lfs_cleanint[LFS_MAX_CLEANIND]; /* Active cleaning intervals */
        int      lfs_cleanind;          /* Index into intervals */
        int lfs_sleepers;               /* # procs sleeping this fs */
        int lfs_pages;                  /* dirty pages blaming this fs */
diff -r 11e425c9e52a -r 7b4a8de2f589 sys/ufs/lfs/lfs_vnops.c
--- a/sys/ufs/lfs/lfs_vnops.c   Sun Aug 02 18:12:41 2015 +0000
+++ b/sys/ufs/lfs/lfs_vnops.c   Sun Aug 02 18:12:59 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lfs_vnops.c,v 1.279 2015/08/02 18:12:41 dholland Exp $ */
+/*     $NetBSD: lfs_vnops.c,v 1.280 2015/08/02 18:12:59 dholland Exp $ */
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.279 2015/08/02 18:12:41 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.280 2015/08/02 18:12:59 dholland Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -1466,7 +1466,7 @@
                            tbn >= fs->lfs_cleanint[i]) {
                                DLOG((DLOG_CLEAN,
                                      "lfs_strategy: ino %d lbn %" PRId64
-                                     " ind %d sn %d fsb %" PRIx32
+                                     " ind %d sn %d fsb %" PRIx64
                                      " given sn %d fsb %" PRIx64 "\n",
                                      ip->i_number, bp->b_lblkno, i,
                                      lfs_dtosn(fs, fs->lfs_cleanint[i]),