Module Name: src
Committed By: pooka
Date: Wed Jun 16 19:26:58 UTC 2010
Modified Files:
src/sys/rump/librump/rumpvfs: rumpfs.c
Log Message:
* support VOP_SEEK
* correctly handle VOP_OPEN(FREAD|FWRITE)
* fix host file write offset
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/rump/librump/rumpvfs/rumpfs.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/rumpfs.c
diff -u src/sys/rump/librump/rumpvfs/rumpfs.c:1.54 src/sys/rump/librump/rumpvfs/rumpfs.c:1.55
--- src/sys/rump/librump/rumpvfs/rumpfs.c:1.54 Wed Jun 16 19:03:08 2010
+++ src/sys/rump/librump/rumpvfs/rumpfs.c Wed Jun 16 19:26:58 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpfs.c,v 1.54 2010/06/16 19:03:08 pooka Exp $ */
+/* $NetBSD: rumpfs.c,v 1.55 2010/06/16 19:26:58 pooka Exp $ */
/*
* Copyright (c) 2009 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.54 2010/06/16 19:03:08 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpfs.c,v 1.55 2010/06/16 19:26:58 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -93,6 +93,7 @@
{ &vop_read_desc, rump_vop_read },
{ &vop_write_desc, rump_vop_write },
{ &vop_open_desc, rump_vop_open },
+ { &vop_seek_desc, genfs_seek },
{ &vop_putpages_desc, genfs_null_putpages },
{ &vop_fsync_desc, rump_vop_success },
{ &vop_lock_desc, genfs_lock },
@@ -838,7 +839,9 @@
return 0;
rn->rn_readfd = rumpuser_open(rn->rn_hostpath,
O_RDONLY, &error);
- } else if (mode & FWRITE) {
+ }
+
+ if (mode & FWRITE) {
if (rn->rn_writefd != -1)
return 0;
rn->rn_writefd = rumpuser_open(rn->rn_hostpath,
@@ -966,7 +969,7 @@
goto out;
KASSERT(uio->uio_resid == 0);
n = rumpuser_pwrite(rn->rn_writefd, buf, bufsize,
- uio->uio_offset + rn->rn_offset, &error);
+ (uio->uio_offset-bufsize) + rn->rn_offset, &error);
if (n >= 0) {
KASSERT(n <= bufsize);
uio->uio_resid = bufsize - n;
