[src/trunk]: src/sys/ufs/ufs Don't putpages in ufs buffercached writes: kasse...

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

details:   https://anonhg.NetBSD.org/src/rev/ff1ea29ab493
branches:  trunk
changeset: 337351:ff1ea29ab493
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Apr 12 22:41:28 2015 +0000

description:
Don't putpages in ufs buffercached writes: kassert there are none.

diffstat:

 sys/ufs/ufs/ufs_readwrite.c |  8 +++-----
 1 files changed, 3 insertions(+), 5 deletions(-)

diffs (29 lines):

diff -r bffab0646101 -r ff1ea29ab493 sys/ufs/ufs/ufs_readwrite.c
--- a/sys/ufs/ufs/ufs_readwrite.c       Sun Apr 12 20:55:02 2015 +0000
+++ b/sys/ufs/ufs/ufs_readwrite.c       Sun Apr 12 22:41:28 2015 +0000
@@ -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);