Sun Apr 12 22:41:28 2015 UTC ()
Don't putpages in ufs buffercached writes: kassert there are none.


(riastradh)
diff -r1.118 -r1.119 src/sys/ufs/ufs/ufs_readwrite.c

cvs diff -r1.118 -r1.119 src/sys/ufs/ufs/ufs_readwrite.c (expand / switch to context diff)
--- src/sys/ufs/ufs/ufs_readwrite.c 2015/03/31 11:43:05 1.118
+++ src/sys/ufs/ufs/ufs_readwrite.c 2015/04/12 22:41:28 1.119
@@ -1,4 +1,4 @@
-/*	$NetBSD: ufs_readwrite.c,v 1.118 2015/03/31 11:43:05 riastradh Exp $	*/
+/*	$NetBSD: ufs_readwrite.c,v 1.119 2015/04/12 22:41:28 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ufs_readwrite.c,v 1.118 2015/03/31 11:43:05 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ufs_readwrite.c,v 1.119 2015/04/12 22:41:28 riastradh Exp $");
 
 #ifdef LFS_READWRITE
 #define	FS			struct lfs
@@ -567,9 +567,7 @@
 #endif /* !LFS_READWRITE */
 
 	/* XXX Should never have pages cached here.  */
-	mutex_enter(vp->v_interlock);
-	VOP_PUTPAGES(vp, trunc_page(origoff), round_page(origoff + resid),
-	    PGO_CLEANIT | PGO_FREE | PGO_SYNCIO | PGO_JOURNALLOCKED);
+	KASSERT(vp->v_uobj.uo_npages == 0);
 	while (uio->uio_resid > 0) {
 		lbn = ufs_lblkno(fs, uio->uio_offset);
 		blkoffset = ufs_blkoff(fs, uio->uio_offset);