diff options
| -rw-r--r-- | sys/fs/nfsclient/nfs_clbio.c | 12 | ||||
| -rw-r--r-- | sys/fs/nwfs/nwfs_io.c | 2 | ||||
| -rw-r--r-- | sys/fs/smbfs/smbfs_io.c | 2 | ||||
| -rw-r--r-- | sys/nfsclient/nfs_bio.c | 12 | ||||
| -rw-r--r-- | sys/vm/vm_page.c | 10 | ||||
| -rw-r--r-- | sys/vm/vm_page.h | 2 | ||||
| -rw-r--r-- | sys/vm/vnode_pager.c | 2 |
7 files changed, 28 insertions, 14 deletions
diff --git a/sys/fs/nfsclient/nfs_clbio.c b/sys/fs/nfsclient/nfs_clbio.c index 6583b9b5661f..26286c5a758a 100644 --- a/sys/fs/nfsclient/nfs_clbio.c +++ b/sys/fs/nfsclient/nfs_clbio.c @@ -218,14 +218,18 @@ ncl_getpages(struct vop_getpages_args *ap) ("nfs_getpages: page %p is dirty", m)); } else { /* - * Read operation was short. If no error occured - * we may have hit a zero-fill section. We simply - * leave valid set to 0. + * Read operation was short. If no error + * occured we may have hit a zero-fill + * section. We leave valid set to 0, and page + * is freed by vm_page_readahead_finish() if + * its index is not equal to requested, or + * page is zeroed and set valid by + * vm_pager_get_pages() for requested page. */ ; } if (i != ap->a_reqpage) - vm_page_readahead_finish(m, error); + vm_page_readahead_finish(m); } VM_OBJECT_UNLOCK(object); return (0); diff --git a/sys/fs/nwfs/nwfs_io.c b/sys/fs/nwfs/nwfs_io.c index 33f3649a2b26..cd3c98943827 100644 --- a/sys/fs/nwfs/nwfs_io.c +++ b/sys/fs/nwfs/nwfs_io.c @@ -459,7 +459,7 @@ nwfs_getpages(ap) } if (i != ap->a_reqpage) - vm_page_readahead_finish(m, error); + vm_page_readahead_finish(m); } VM_OBJECT_UNLOCK(object); return 0; diff --git a/sys/fs/smbfs/smbfs_io.c b/sys/fs/smbfs/smbfs_io.c index 9a4610fc556a..6dacd0664148 100644 --- a/sys/fs/smbfs/smbfs_io.c +++ b/sys/fs/smbfs/smbfs_io.c @@ -523,7 +523,7 @@ smbfs_getpages(ap) } if (i != reqpage) - vm_page_readahead_finish(m, error); + vm_page_readahead_finish(m); } VM_OBJECT_UNLOCK(object); return 0; diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index ae3533688032..0003974bd68d 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -212,14 +212,18 @@ nfs_getpages(struct vop_getpages_args *ap) ("nfs_getpages: page %p is dirty", m)); } else { /* - * Read operation was short. If no error occured - * we may have hit a zero-fill section. We simply - * leave valid set to 0. + * Read operation was short. If no error + * occured we may have hit a zero-fill + * section. We leave valid set to 0, and page + * is freed by vm_page_readahead_finish() if + * its index is not equal to requested, or + * page is zeroed and set valid by + * vm_pager_get_pages() for requested page. */ ; } if (i != ap->a_reqpage) - vm_page_readahead_finish(m, error); + vm_page_readahead_finish(m); } VM_OBJECT_UNLOCK(object); return (0); diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index b67929052dd4..b012065c9a70 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -699,10 +699,10 @@ vm_page_free_zero(vm_page_t m) * array which is not the request page. */ void -vm_page_readahead_finish(vm_page_t m, int error) +vm_page_readahead_finish(vm_page_t m) { - if (error == 0) { + if (m->valid != 0) { /* * Since the page is not the requested page, whether * it should be activated or deactivated is not @@ -721,6 +721,12 @@ vm_page_readahead_finish(vm_page_t m, int error) } vm_page_wakeup(m); } else { + /* + * Free the completely invalid page. Such page state + * occurs due to the short read operation which did + * not covered our page at all, or in case when a read + * error happens. + */ vm_page_lock(m); vm_page_free(m); vm_page_unlock(m); diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index 14c943638f64..410948b1c832 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -388,7 +388,7 @@ vm_page_t vm_page_next(vm_page_t m); int vm_page_pa_tryrelock(pmap_t, vm_paddr_t, vm_paddr_t *); vm_page_t vm_page_prev(vm_page_t m); void vm_page_putfake(vm_page_t m); -void vm_page_readahead_finish(vm_page_t m, int error); +void vm_page_readahead_finish(vm_page_t m); void vm_page_reference(vm_page_t m); void vm_page_remove (vm_page_t); void vm_page_rename (vm_page_t, vm_object_t, vm_pindex_t); diff --git a/sys/vm/vnode_pager.c b/sys/vm/vnode_pager.c index da88b083a296..b0139ce07f42 100644 --- a/sys/vm/vnode_pager.c +++ b/sys/vm/vnode_pager.c @@ -987,7 +987,7 @@ vnode_pager_generic_getpages(vp, m, bytecount, reqpage) } if (i != reqpage) - vm_page_readahead_finish(mt, error); + vm_page_readahead_finish(mt); } VM_OBJECT_UNLOCK(object); if (error) { |