[src/trunk]: src/sys/ufs/lfs Same putpages->kassert in ulfs_readwrite.c

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

details:   https://anonhg.NetBSD.org/src/rev/939859789785
branches:  trunk
changeset: 337353:939859789785
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Apr 12 22:49:55 2015 +0000

description:
Same putpages->kassert in ulfs_readwrite.c

diffstat:

 sys/ufs/lfs/ulfs_readwrite.c |  11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diffs (46 lines):

diff -r 6af06f34561f -r 939859789785 sys/ufs/lfs/ulfs_readwrite.c
--- a/sys/ufs/lfs/ulfs_readwrite.c      Sun Apr 12 22:48:38 2015 +0000
+++ b/sys/ufs/lfs/ulfs_readwrite.c      Sun Apr 12 22:49:55 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ulfs_readwrite.c,v 1.15 2015/03/28 19:24:05 maxv Exp $ */
+/*     $NetBSD: ulfs_readwrite.c,v 1.16 2015/04/12 22:49:55 riastradh Exp $    */
 /*  from NetBSD: ufs_readwrite.c,v 1.105 2013/01/22 09:39:18 dholland Exp  */
 
 /*-
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.15 2015/03/28 19:24:05 maxv Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ulfs_readwrite.c,v 1.16 2015/04/12 22:49:55 riastradh Exp $");
 
 #ifdef LFS_READWRITE
 #define        FS                      struct lfs
@@ -465,7 +465,7 @@
        FS *fs;
        int flags;
        struct buf *bp;
-       off_t osize, origoff;
+       off_t osize;
        int resid, xfersize, size, blkoffset;
        daddr_t lbn;
        int extended=0;
@@ -498,7 +498,6 @@
        fstrans_start(vp->v_mount, FSTRANS_SHARED);
 
        flags = ioflag & IO_SYNC ? B_SYNC : 0;
-       origoff = uio->uio_offset;
        resid = uio->uio_resid;
        osize = ip->i_size;
        error = 0;
@@ -511,9 +510,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 = lfs_lblkno(fs, uio->uio_offset);
                blkoffset = lfs_blkoff(fs, uio->uio_offset);