From owner-svn-src-user@FreeBSD.ORG Mon Nov 23 06:48:56 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 140871065670; Mon, 23 Nov 2009 06:48:56 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DDE548FC1D; Mon, 23 Nov 2009 06:48:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nAN6msRE043120; Mon, 23 Nov 2009 06:48:54 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAN6msJI043119; Mon, 23 Nov 2009 06:48:54 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200911230648.nAN6msJI043119@svn.freebsd.org> From: Kip Macy Date: Mon, 23 Nov 2009 06:48:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199692 - user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Nov 2009 06:48:56 -0000 Author: kmacy Date: Mon Nov 23 06:48:54 2009 New Revision: 199692 URL: http://svn.freebsd.org/changeset/base/199692 Log: - always release pages on invalidate - assert that they've been released Modified: user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Modified: user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c ============================================================================== --- user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov 23 05:47:53 2009 (r199691) +++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c Mon Nov 23 06:48:54 2009 (r199692) @@ -1332,19 +1332,25 @@ arc_binval(spa_t *spa, dva_t *dva, uint6 bp->b_flags |= B_INVAL; bp->b_birth = 0; brelse(bp); - } else { + } else BO_UNLOCK(bo); - start = OFF_TO_IDX((blkno << 9)); - end = start + OFF_TO_IDX(size); - object = vp->v_object; - if (size == 0) - return; - VM_OBJECT_LOCK(object); - vm_page_cache_free(object, start, end); - vm_object_page_remove(object, start, end, FALSE); - VM_OBJECT_UNLOCK(object); + start = OFF_TO_IDX((blkno << 9)); + end = start + OFF_TO_IDX(size); + object = vp->v_object; + + if (size == 0) + return; + VM_OBJECT_LOCK(object); + vm_page_cache_free(object, start, end); + vm_object_page_remove(object, start, end, FALSE); +#ifdef INVARIANTS + for (i = 0; i < OFF_TO_IDX(size); i++) { + KASSERT(vm_page_lookup(object, start + i) == NULL, + ("found page at %ld", start + i)); } +#endif + VM_OBJECT_UNLOCK(object); } static void @@ -1363,13 +1369,11 @@ arc_pcache(struct vnode *vp, struct buf VM_OBJECT_LOCK(object); vm_page_cache_free(object, start, start + bp->b_npages); - vm_object_page_remove(object, start, start + bp->b_npages, FALSE); for (i = 0; i < bp->b_npages; i++) { m = bp->b_pages[i]; vm_page_insert(m, object, start + i); } VM_OBJECT_UNLOCK(object); - bp->b_flags |= B_VMIO; } static void @@ -1417,6 +1421,7 @@ arc_bcache(arc_buf_t *buf) arc_pcache(vp, newbp, blkno, FALSE); else BO_UNLOCK(bo); + } static void @@ -1494,7 +1499,7 @@ arc_getblk(arc_buf_t *buf) #ifdef INVARIANTS for (i = 0; i < newbp->b_npages; i++) KASSERT(newbp->b_pages[i]->object == NULL, - "newbp page not removed"); + ("newbp page not removed")); #endif } buf->b_bp = newbp; @@ -1520,7 +1525,7 @@ arc_brelse(arc_buf_t *buf, void *data, s #ifdef INVARIANTS for (i = 0; i < bp->b_npages; i++) KASSERT(bp->b_pages[i]->object == NULL, - "newbp page not removed"); + ("newbp page not removed")); #endif arc_bcache(buf); @@ -2818,7 +2823,7 @@ arc_read_done(zio_t *zio) int i; for (i = 0; i < buf->b_bp->b_npages; i++) KASSERT(buf->b_bp->b_pages[i]->object == NULL, - "bp page not removed"); + ("bp page not removed")); #endif buf->b_bp->b_flags |= B_CACHE; buf->b_bp->b_flags &= ~B_INVAL;