From owner-svn-src-stable-8@FreeBSD.ORG  Sun Nov  7 19:32:04 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1521A106566B;
	Sun,  7 Nov 2010 19:32:04 +0000 (UTC) (envelope-from avg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C93C78FC3A;
	Sun,  7 Nov 2010 19:32:03 +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 oA7JW3PU072221;
	Sun, 7 Nov 2010 19:32:03 GMT (envelope-from avg@svn.freebsd.org)
Received: (from avg@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oA7JW3BY072220;
	Sun, 7 Nov 2010 19:32:03 GMT (envelope-from avg@svn.freebsd.org)
Message-Id: <201011071932.oA7JW3BY072220@svn.freebsd.org>
From: Andriy Gapon <avg@FreeBSD.org>
Date: Sun, 7 Nov 2010 19:32:03 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r214941 -
	stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 07 Nov 2010 19:32:04 -0000

Author: avg
Date: Sun Nov  7 19:32:03 2010
New Revision: 214941
URL: http://svn.freebsd.org/changeset/base/214941

Log:
  Followup to r214936: zfs_getpages: account for differences from head
  in page locking

Modified:
  stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c

Modified: stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
==============================================================================
--- stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sun Nov  7 19:23:25 2010	(r214940)
+++ stable/8/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c	Sun Nov  7 19:32:03 2010	(r214941)
@@ -4181,14 +4181,13 @@ zfs_getpages(struct vnode *vp, vm_page_t
 	KASSERT(vp->v_object == object, ("mismatching object"));
 
 	VM_OBJECT_LOCK(object);
-
+	vm_page_lock_queues();
 	for (i = 0; i < pcount; i++) {
 		if (i != reqpage) {
-			vm_page_lock(m[i]);
 			vm_page_free(m[i]);
-			vm_page_unlock(m[i]);
 		}
 	}
+	vm_page_unlock_queues();
 
 	if (mreq->valid) {
 		if (mreq->valid != VM_PAGE_BITS_ALL)