Module Name: src
Committed By: martin
Date: Sat Mar 21 15:25:24 UTC 2020
Modified Files:
src/sys/ufs/ffs [netbsd-9]: ffs_alloc.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.164.4.1 src/sys/ufs/ffs/ffs_alloc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ffs/ffs_alloc.c
diff -u src/sys/ufs/ffs/ffs_alloc.c:1.164 src/sys/ufs/ffs/ffs_alloc.c:1.164.4.1
--- src/sys/ufs/ffs/ffs_alloc.c:1.164 Sun Apr 14 15:55:24 2019
+++ src/sys/ufs/ffs/ffs_alloc.c Sat Mar 21 15:25:24 2020
@@ -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_alloc(struct inode *ip, daddr_t lbn,
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 @@ ffs_realloccg(struct inode *ip, daddr_t
*/
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);
