Module Name: src
Committed By: pooka
Date: Sat Dec 18 11:45:09 UTC 2010
Modified Files:
src/sys/rump/librump/rumpvfs: vm_vfs.c
Log Message:
Don't loop eternally if uiomove() fails eternally (e.g. because
the connection to the client has been severed).
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/rump/librump/rumpvfs/vm_vfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/vm_vfs.c
diff -u src/sys/rump/librump/rumpvfs/vm_vfs.c:1.23 src/sys/rump/librump/rumpvfs/vm_vfs.c:1.24
--- src/sys/rump/librump/rumpvfs/vm_vfs.c:1.23 Thu Sep 9 12:18:39 2010
+++ src/sys/rump/librump/rumpvfs/vm_vfs.c Sat Dec 18 11:45:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_vfs.c,v 1.23 2010/09/09 12:18:39 pooka Exp $ */
+/* $NetBSD: vm_vfs.c,v 1.24 2010/12/18 11:45:09 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.23 2010/09/09 12:18:39 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_vfs.c,v 1.24 2010/12/18 11:45:09 pooka Exp $");
#include <sys/param.h>
@@ -195,8 +195,14 @@
pageoff = uio->uio_offset & PAGE_MASK;
xfersize = MIN(MIN(todo, PAGE_SIZE), PAGE_SIZE-pageoff);
KASSERT(xfersize > 0);
- uiomove((uint8_t *)pg->uanon + pageoff,
+ rv = uiomove((uint8_t *)pg->uanon + pageoff,
xfersize, uio);
+ if (rv) {
+ mutex_enter(&uobj->vmobjlock);
+ uvm_page_unbusy(pgs, npages);
+ mutex_exit(&uobj->vmobjlock);
+ goto out;
+ }
if (uio->uio_rw == UIO_WRITE)
pg->flags &= ~(PG_CLEAN | PG_FAKE);
todo -= xfersize;
