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

[Rick Macklem]

Author: rmacklem
Date: Sat May 16 22:31:38 2009
New Revision: 192231
URL: http://svn.freebsd.org/changeset/base/192231

Log:
  Changed sys/fs/nfs_clbio.c in the same way Alan Cox changed
  sys/nfsclient/nfs_bio.c for r192134, so that the sources stay
  in sync.
  
  Approved by:	kib (mentor)

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

Modified: head/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clbio.c	Sat May 16 22:22:31 2009	(r192230)
+++ head/sys/fs/nfsclient/nfs_clbio.c	Sat May 16 22:31:38 2009	(r192231)
@@ -313,9 +313,9 @@ ncl_getpages(struct vop_getpages_args *a
 			 * Read operation filled a partial page.
 			 */
 			m->valid = 0;
-			vm_page_set_validclean(m, 0, size - toff);
-			/* handled by vm_fault now	  */
-			/* vm_page_zero_invalid(m, TRUE); */
+			vm_page_set_valid(m, 0, size - toff);
+			KASSERT((m->dirty & vm_page_bits(0, size - toff)) == 0,
+			    ("nfs_getpages: page %p is dirty", m));
 		} else {
 			/*
 			 * Read operation was short.  If no error occured