svn commit: r192245 - head/sys/fs/nfsclient

[Alan Cox]

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);
 	}