svn commit: r191964 - in head/sys: fs/smbfs nfsclient

[Alan Cox]

Author: alc
Date: Sun May 10 17:05:43 2009
New Revision: 191964
URL: http://svn.freebsd.org/changeset/base/191964

Log:
  Eliminate stale comments.
  
  Eliminate a case of unnecessary page queues locking.

Modified:
  head/sys/fs/smbfs/smbfs_io.c
  head/sys/nfsclient/nfs_bio.c

Modified: head/sys/fs/smbfs/smbfs_io.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_io.c	Sun May 10 16:00:41 2009	(r191963)
+++ head/sys/fs/smbfs/smbfs_io.c	Sun May 10 17:05:43 2009	(r191964)
@@ -456,8 +456,6 @@ smbfs_getpages(ap)
 
 	VM_OBJECT_LOCK(object);
 	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 != reqpage)
@@ -526,8 +524,6 @@ smbfs_getpages(ap)
 			 */
 			m->valid = 0;
 			vm_page_set_validclean(m, 0, size - toff);
-			/* handled by vm_fault now	  */
-			/* vm_page_zero_invalid(m, TRUE); */
 		} else {
 			/*
 			 * Read operation was short.  If no error occured

Modified: head/sys/nfsclient/nfs_bio.c
==============================================================================
--- head/sys/nfsclient/nfs_bio.c	Sun May 10 16:00:41 2009	(r191963)
+++ head/sys/nfsclient/nfs_bio.c	Sun May 10 17:05:43 2009	(r191964)
@@ -138,10 +138,8 @@ nfs_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]);
@@ -150,7 +148,6 @@ nfs_getpages(struct vop_getpages_args *a
 			VM_OBJECT_UNLOCK(object);
 			return(0);
 		}
-		vm_page_unlock_queues();
 		VM_OBJECT_UNLOCK(object);
 	}
 
@@ -219,8 +216,6 @@ nfs_getpages(struct vop_getpages_args *a
 			 */
 			m->valid = 0;
 			vm_page_set_validclean(m, 0, size - toff);
-			/* handled by vm_fault now	  */
-			/* vm_page_zero_invalid(m, TRUE); */
 		} else {
 			/*
 			 * Read operation was short.  If no error occured