From 3933ec4d15fb0a7cb7105d58222bc4f4affbb6f3 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Thu, 28 May 2009 18:11:09 +0000 Subject: [PATCH] Make *getpages()s' assertion on the state of each page's dirty bits stricter. --- sys/fs/nfsclient/nfs_clbio.c | 2 +- sys/fs/smbfs/smbfs_io.c | 2 +- sys/nfsclient/nfs_bio.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c index 37f824cb375..7b58297ad87 100644 --- a/sys/fs/nfsclient/nfs_clbio.c +++ b/sys/fs/nfsclient/nfs_clbio.c @@ -311,7 +311,7 @@ ncl_getpages(struct vop_getpages_args *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, ("nfs_getpages: page %p is dirty", m)); } else { /* diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c index 4ea192b14f6..8ff8266f685 100644 --- a/sys/fs/smbfs/smbfs_io.c +++ b/sys/fs/smbfs/smbfs_io.c @@ -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 { /* diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index 92be17c0238..3c12ea057ef 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -214,7 +214,7 @@ nfs_getpages(struct vop_getpages_args *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, ("nfs_getpages: page %p is dirty", m)); } else { /*