From owner-svn-src-user@FreeBSD.ORG  Mon Nov 23 04:36:55 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 EC06F106566C;
	Mon, 23 Nov 2009 04:36:55 +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 DB5DD8FC0A;
	Mon, 23 Nov 2009 04:36: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 nAN4ashL040366;
	Mon, 23 Nov 2009 04:36:54 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nAN4asSZ040364;
	Mon, 23 Nov 2009 04:36:54 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200911230436.nAN4asSZ040364@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 23 Nov 2009 04:36: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: r199689 -
	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 &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 23 Nov 2009 04:36:56 -0000

Author: kmacy
Date: Mon Nov 23 04:36:54 2009
New Revision: 199689
URL: http://svn.freebsd.org/changeset/base/199689

Log:
  - use vm_object_page_remove to remove a range of pages
  - clear vmio on getblk'd buffer

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 03:44:25 2009	(r199688)
+++ user/kmacy/releng_8_fcs_buf/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c	Mon Nov 23 04:36:54 2009	(r199689)
@@ -1342,10 +1342,7 @@ arc_binval(spa_t *spa, dva_t *dva, uint6
 			return;
 		VM_OBJECT_LOCK(object);
 		vm_page_cache_free(object, start, end);
-		for (i = 0; i < OFF_TO_IDX(size); i++) {
-			if ((m = vm_page_lookup(object, start + i)) != NULL)
-				vm_page_free(m);
-		}
+		vm_object_page_remove(object, start, end, FALSE);
 		VM_OBJECT_UNLOCK(object);
 	}
 }
@@ -1361,9 +1358,8 @@ 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++) {
-		if ((m = vm_page_lookup(object, start + i)) != NULL)
-			vm_page_free(m);
 		m = bp->b_pages[i];
 		vm_page_insert(m, object, start + i);
 	}
@@ -1477,6 +1473,7 @@ arc_getblk(arc_buf_t *buf)
 			vm_page_unlock_queues();
 			VM_OBJECT_UNLOCK(object);
 			brelvp(newbp);
+			newbp->b_flags &= ~B_VMIO;
 		}
 		data = newbp->b_data;
 	}