From owner-svn-src-all@FreeBSD.ORG  Sun May 17 06:45:30 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E78EC106564A;
	Sun, 17 May 2009 06:45:30 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D72558FC0A;
	Sun, 17 May 2009 06:45:30 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4H6jUnL016607;
	Sun, 17 May 2009 06:45:30 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4H6jUUd016606;
	Sun, 17 May 2009 06:45:30 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200905170645.n4H6jUUd016606@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sun, 17 May 2009 06:45:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192245 - head/sys/fs/nfsclient
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 17 May 2009 06:45:31 -0000

Author: alc
Date: Sun May 17 06:45:30 2009
New Revision: 192245
URL: http://svn.freebsd.org/changeset/base/192245

Log:
  Merge r191964: Eliminate a case of unnecessary page queues locking.

Modified:
  head/sys/fs/nfsclient/nfs_clbio.c

Modified: head/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clbio.c	Sun May 17 05:55:13 2009	(r192244)
+++ head/sys/fs/nfsclient/nfs_clbio.c	Sun May 17 06:45:30 2009	(r192245)
@@ -232,10 +232,8 @@ ncl_getpages(struct vop_getpages_args *a
 		vm_page_t m = pages[ap->a_reqpage];
 
 		VM_OBJECT_LOCK(object);
-		vm_page_lock_queues();
 		if (m->valid != 0) {
-			/* handled by vm_fault now	  */
-			/* vm_page_zero_invalid(m, TRUE); */
+			vm_page_lock_queues();
 			for (i = 0; i < npages; ++i) {
 				if (i != ap->a_reqpage)
 					vm_page_free(pages[i]);
@@ -244,7 +242,6 @@ ncl_getpages(struct vop_getpages_args *a
 			VM_OBJECT_UNLOCK(object);
 			return(0);
 		}
-		vm_page_unlock_queues();
 		VM_OBJECT_UNLOCK(object);
 	}