diff options
| author | kib <kib@FreeBSD.org> | 2011-06-01 21:00:28 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2011-06-01 21:00:28 +0000 |
| commit | ad5bd0652340908efab201a5a95766c83a96160a (patch) | |
| tree | 07e1defe92d7e0b4f536a6246e42367ce49158b2 /sys/nfsclient/nfs_bio.c | |
| parent | fa6dbdd4a2c067d514a8442f406a37ad52fb9be7 (diff) | |
| download | FreeBSD-src-ad5bd0652340908efab201a5a95766c83a96160a.zip FreeBSD-src-ad5bd0652340908efab201a5a95766c83a96160a.tar.gz | |
In the VOP_PUTPAGES() implementations, change the default error from
VM_PAGER_AGAIN to VM_PAGER_ERROR for the uwritten pages. Return
VM_PAGER_AGAIN for the partially written page. Always forward at least
one page in the loop of vm_object_page_clean().
VM_PAGER_ERROR causes the page reactivation and does not clear the
page dirty state, so the write is not lost.
The change fixes an infinite loop in vm_object_page_clean() when the
filesystem returns permanent errors for some page writes.
Reported and tested by: gavin
Reviewed by: alc, rmacklem
MFC after: 1 week
Diffstat (limited to 'sys/nfsclient/nfs_bio.c')
| -rw-r--r-- | sys/nfsclient/nfs_bio.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sys/nfsclient/nfs_bio.c b/sys/nfsclient/nfs_bio.c index 9a777c8..da8a2ec 100644 --- a/sys/nfsclient/nfs_bio.c +++ b/sys/nfsclient/nfs_bio.c @@ -300,7 +300,7 @@ nfs_putpages(struct vop_putpages_args *ap) } for (i = 0; i < npages; i++) - rtvals[i] = VM_PAGER_AGAIN; + rtvals[i] = VM_PAGER_ERROR; /* * When putting pages, do not extend file past EOF. @@ -344,11 +344,7 @@ nfs_putpages(struct vop_putpages_args *ap) relpbuf(bp, &nfs_pbuf_freecnt); if (!error) { - int nwritten = round_page(count - uio.uio_resid) / PAGE_SIZE; - for (i = 0; i < nwritten; i++) { - rtvals[i] = VM_PAGER_OK; - vm_page_undirty(pages[i]); - } + vnode_pager_undirty_pages(pages, rtvals, count - uio.uio_resid); if (must_commit) { nfs_clearcommit(vp->v_mount); } |
