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

[Alan Cox]

Author: alc
Date: Thu May 28 18:11:09 2009
New Revision: 192986
URL: http://svn.freebsd.org/changeset/base/192986

Log:
  Make *getpages()s' assertion on the state of each page's dirty bits
  stricter.

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

Modified: head/sys/fs/nfsclient/nfs_clbio.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clbio.c	Thu May 28 17:36:44 2009	(r192985)
+++ head/sys/fs/nfsclient/nfs_clbio.c	Thu May 28 18:11:09 2009	(r192986)
@@ -311,7 +311,7 @@ ncl_getpages(struct vop_getpages_args *a
 			 */
 			m->valid = 0;
 			vm_page_set_valid(m, 0, size - toff);
-			KASSERT((m->dirty & vm_page_bits(0, size - toff)) == 0,
+			KASSERT(m->dirty == 0,
 			    ("nfs_getpages: page %p is dirty", m));
 		} else {
 			/*

Modified: head/sys/fs/smbfs/smbfs_io.c
==============================================================================
--- head/sys/fs/smbfs/smbfs_io.c	Thu May 28 17:36:44 2009	(r192985)
+++ head/sys/fs/smbfs/smbfs_io.c	Thu May 28 18:11:09 2009	(r192986)
@@ -525,7 +525,7 @@ smbfs_getpages(ap)
 			 */
 			m->valid = 0;
 			vm_page_set_valid(m, 0, size - toff);
-			KASSERT((m->dirty & vm_page_bits(0, size - toff)) == 0,
+			KASSERT(m->dirty == 0,
 			    ("smbfs_getpages: page %p is dirty", m));
 		} else {
 			/*

Modified: head/sys/nfsclient/nfs_bio.c
==============================================================================
--- head/sys/nfsclient/nfs_bio.c	Thu May 28 17:36:44 2009	(r192985)
+++ head/sys/nfsclient/nfs_bio.c	Thu May 28 18:11:09 2009	(r192986)
@@ -214,7 +214,7 @@ nfs_getpages(struct vop_getpages_args *a
 			 */
 			m->valid = 0;
 			vm_page_set_valid(m, 0, size - toff);
-			KASSERT((m->dirty & vm_page_bits(0, size - toff)) == 0,
+			KASSERT(m->dirty == 0,
 			    ("nfs_getpages: page %p is dirty", m));
 		} else {
 			/*