Module Name: src
Committed By: martin
Date: Tue Oct 14 08:16:03 UTC 2014
Modified Files:
src/sys/fs/puffs [netbsd-7]: puffs_vnops.c
Log Message:
Pull up revisions 1.192-1.194: fix debug printf formatting and make
it compile without debugging enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.182.2.6 -r1.182.2.7 src/sys/fs/puffs/puffs_vnops.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/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.182.2.6 src/sys/fs/puffs/puffs_vnops.c:1.182.2.7
--- src/sys/fs/puffs/puffs_vnops.c:1.182.2.6 Mon Oct 13 18:57:46 2014
+++ src/sys/fs/puffs/puffs_vnops.c Tue Oct 14 08:16:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.182.2.6 2014/10/13 18:57:46 martin Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.182.2.7 2014/10/14 08:16:03 martin Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.182.2.6 2014/10/13 18:57:46 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: puffs_vnops.c,v 1.182.2.7 2014/10/14 08:16:03 martin Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -1159,9 +1159,10 @@ zerofill_lastpage(struct vnode *vp, voff
error = ubc_uiomove(&vp->v_uobj, &uio, len,
UVM_ADV_SEQUENTIAL, UBC_WRITE|UBC_UNMAP_FLAG(vp));
- if (error)
- DPRINTF(("zero-fill 0x%lx@0x%" PRIx64 " failed: error = %d\n",
- len, off, error));
+ if (error) {
+ DPRINTF(("zero-fill 0x%" PRIxVSIZE "@0x%" PRIx64
+ " failed: error = %d\n", len, off, error));
+ }
return;
}
