Module Name: src
Committed By: pooka
Date: Mon Apr 12 22:19:18 UTC 2010
Modified Files:
src/sys/rump/librump/rumpvfs: Makefile.rumpvfs rump_vfs.c
Removed Files:
src/sys/rump/librump/rumpvfs: fstrans_stub.c
Log Message:
Support real file system transactions/suspension (vfs_trans.c)
instead of just stubbing it.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs
cvs rdiff -u -r1.2 -r0 src/sys/rump/librump/rumpvfs/fstrans_stub.c
cvs rdiff -u -r1.44 -r1.45 src/sys/rump/librump/rumpvfs/rump_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/Makefile.rumpvfs
diff -u src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.26 src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.27
--- src/sys/rump/librump/rumpvfs/Makefile.rumpvfs:1.26 Mon Mar 29 13:20:31 2010
+++ src/sys/rump/librump/rumpvfs/Makefile.rumpvfs Mon Apr 12 22:19:17 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpvfs,v 1.26 2010/03/29 13:20:31 pooka Exp $
+# $NetBSD: Makefile.rumpvfs,v 1.27 2010/04/12 22:19:17 pooka Exp $
#
.include "${RUMPTOP}/Makefile.rump"
@@ -17,8 +17,6 @@
#
SRCS= rump_vfs.c devnodes.c devnull.c rumpblk.c rumpfs.c vm_vfs.c
-SRCS+= fstrans_stub.c
-
SRCS+= rumpvfs_if_wrappers.c
# sys/kern I/O
@@ -27,7 +25,7 @@
# sys/kern vfs
SRCS+= vfs_bio.c vfs_cache.c vfs_cwd.c vfs_dirhash.c vfs_getcwd.c \
vfs_hooks.c vfs_init.c vfs_lockf.c vfs_lookup.c vfs_subr.c \
- vfs_syscalls.c vfs_vnops.c vfs_wapbl.c vfs_xattr.c
+ vfs_syscalls.c vfs_trans.c vfs_vnops.c vfs_wapbl.c vfs_xattr.c
# sys/kern module (and syscall)
SRCS+= kern_module_vfs.c subr_kobj_vfs.c sys_module.c
Index: src/sys/rump/librump/rumpvfs/rump_vfs.c
diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.44 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.45
--- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.44 Fri Mar 26 18:21:28 2010
+++ src/sys/rump/librump/rumpvfs/rump_vfs.c Mon Apr 12 22:19:17 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_vfs.c,v 1.44 2010/03/26 18:21:28 pooka Exp $ */
+/* $NetBSD: rump_vfs.c,v 1.45 2010/04/12 22:19:17 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,13 +29,14 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.44 2010/03/26 18:21:28 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.45 2010/04/12 22:19:17 pooka Exp $");
#include <sys/param.h>
#include <sys/buf.h>
#include <sys/conf.h>
#include <sys/evcnt.h>
#include <sys/filedesc.h>
+#include <sys/fstrans.h>
#include <sys/lockf.h>
#include <sys/kthread.h>
#include <sys/module.h>
@@ -102,6 +103,7 @@
cwd_sys_init();
lf_init();
spec_init();
+ fstrans_init();
if (rump_threads) {
if ((rv = kthread_create(PRI_BIO, KTHREAD_MPSAFE, NULL,
