[src/netbsd-9]: src/sys/ufs/ffs Pull up following revision(s) (requested by r...

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

details:   https://anonhg.NetBSD.org/src/rev/b3485015142f
branches:  netbsd-9
changeset: 746075:b3485015142f
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Mar 21 15:25:24 2020 +0000

description:
Pull up following revision(s) (requested by riastradh in ticket #790):

        sys/ufs/ffs/ffs_alloc.c: revision 1.165

Fix non-DIAGNOSTIC build with UVM_PAGE_TRKOWN.

diffstat:

 sys/ufs/ffs/ffs_alloc.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 02ebfe29f104 -r b3485015142f sys/ufs/ffs/ffs_alloc.c
--- a/sys/ufs/ffs/ffs_alloc.c   Sat Mar 21 15:24:06 2020 +0000
+++ b/sys/ufs/ffs/ffs_alloc.c   Sat Mar 21 15:25:24 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ffs_alloc.c,v 1.164 2019/04/14 15:55:24 kardel Exp $   */
+/*     $NetBSD: ffs_alloc.c,v 1.164.4.1 2020/03/21 15:25:24 martin Exp $       */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.164 2019/04/14 15:55:24 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffs_alloc.c,v 1.164.4.1 2020/03/21 15:25:24 martin Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ffs.h"
@@ -208,7 +208,7 @@
            ffs_lblktosize(fs, (voff_t)lbn) < round_page(vp->v_size) &&
            ((vp->v_vflag & VV_MAPPED) != 0 || (size & PAGE_MASK) != 0 ||
             ffs_blkoff(fs, size) != 0)) {
-               struct vm_page *pg;
+               struct vm_page *pg __diagused;
                struct uvm_object *uobj = &vp->v_uobj;
                voff_t off = trunc_page(ffs_lblktosize(fs, lbn));
                voff_t endoff = round_page(ffs_lblktosize(fs, lbn) + size);
@@ -328,7 +328,7 @@
         */
 
        if (ITOV(ip)->v_type == VREG) {
-               struct vm_page *pg;
+               struct vm_page *pg __diagused;
                struct uvm_object *uobj = &ITOV(ip)->v_uobj;
                voff_t off = trunc_page(ffs_lblktosize(fs, lbprev));
                voff_t endoff = round_page(ffs_lblktosize(fs, lbprev) + osize);