 @@ -1,14 +1,14 @@
-/*	$NetBSD: rump_vfs.c,v 1.80 2014/05/23 10:56:36 pooka Exp $	*/
+/*	$NetBSD: rump_vfs.c,v 1.81 2014/11/17 14:30:31 pooka Exp $	*/
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Finnish Cultural Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -19,27 +19,27 @@
  * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
  * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.80 2014/05/23 10:56:36 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.81 2014/11/17 14:30:31 pooka Exp $");
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/evcnt.h>
 #include <sys/fcntl.h>
 #include <sys/filedesc.h>
 #include <sys/fstrans.h>
 #include <sys/lockf.h>
 #include <sys/kthread.h>
 #include <sys/module.h>
 #include <sys/namei.h>
 #include <sys/queue.h>
 @@ -69,26 +69,27 @@ pvfs_init(struct proc *p)
 static void
 pvfs_rele(struct proc *p)
+{
 	cwdfree(p->p_cwdi);
+}
 static void
 fini(void)
+{
 	vfs_shutdown();
 	rumpblk_fini();
+}
 static void
 drainbufs(int npages)
+{
 	mutex_enter(&bufcache_lock);
 	buf_drain(npages);
 	mutex_exit(&bufcache_lock);
+}
 RUMP_COMPONENT(RUMP__FACTION_VFS)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rump_vfs_private.h,v 1.17 2013/03/07 22:12:34 pooka Exp $	*/
+/*	$NetBSD: rump_vfs_private.h,v 1.18 2014/11/17 14:30:31 pooka Exp $	*/
 /*
  * Copyright (c) 2008 Antti Kantee.  All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
 @@ -30,26 +30,27 @@
 #include <sys/types.h>
 #include <sys/conf.h>
 void		rumpfs_init(void);
 int		rump_devnull_init(void);
 #define RUMPBLK_DEVMAJOR 197 /* from conf/majors, XXX: not via config yet */
 #define RUMPBLK_SIZENOTSET ((uint64_t)-1)
 int	rumpblk_register(const char *, devminor_t *, uint64_t, uint64_t);
 int	rumpblk_deregister(const char *);
 int	rumpblk_init(void);
 void	rumpblk_fini(void);
 void	rump_biodone(void *, size_t, int);
 void	rump_vfs_builddevs(struct devsw_conv *, size_t numelem);
 extern int	(*rump_vfs_makeonedevnode)(dev_t, const char *,
 					   devmajor_t, devminor_t);
 extern int	(*rump_vfs_makedevnodes)(dev_t, const char *, char,
 					 devmajor_t, devminor_t, int);
 extern void	(*rump_vfs_drainbufs)(int);
 extern void	(*rump_vfs_fini)(void);
 #include <sys/mount.h>

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rumpblk.c,v 1.57 2014/07/25 08:10:40 dholland Exp $	*/
+/*	$NetBSD: rumpblk.c,v 1.58 2014/11/17 14:30:31 pooka Exp $	*/
 /*
  * Copyright (c) 2009 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by the
  * Finnish Cultural Foundation.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -27,27 +27,27 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 /*
  * Block device emulation.  Presents a block device interface and
  * uses rumpuser system calls to satisfy I/O requests.
+ *
  * We provide fault injection.  The driver can be made to fail
  * I/O occasionally.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.57 2014/07/25 08:10:40 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rumpblk.c,v 1.58 2014/11/17 14:30:31 pooka Exp $");
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/condvar.h>
 #include <sys/disklabel.h>
 #include <sys/evcnt.h>
 #include <sys/fcntl.h>
 #include <sys/kmem.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/cprng.h>
 @@ -331,26 +331,45 @@ rumpblk_deregister(const char *path)
 	if (i == RUMPBLK_SIZE)
 		return ENOENT;
 	rblk = &minors[i];
 	backend_close(rblk);
 	free(rblk->rblk_path, M_TEMP);
 	memset(&rblk->rblk_label, 0, sizeof(rblk->rblk_label));
 	rblk->rblk_path = NULL;
 	return 0;
+}
 /*
  * Release all backend resources, to be called only when the rump
  * kernel is being shut down.
  * This routine does not do a full "fini" since we're going down anyway.
  */
 void
 rumpblk_fini(void)
+{
 	int i;
 	for (i = 0; i < RUMPBLK_SIZE; i++) {
 		struct rblkdev *rblk;
 		rblk = &minors[i];
 		if (rblk->rblk_fd != -1)
 			backend_close(rblk);
+	}
+}
 static int
 backend_open(struct rblkdev *rblk, const char *path)
+{
 	int error, fd;
 	KASSERT(rblk->rblk_fd == -1);
 	error = rumpuser_open(path,
 	    RUMPUSER_OPEN_RDWR | RUMPUSER_OPEN_BIO, &fd);
 	if (error) {
 		error = rumpuser_open(path,
 		    RUMPUSER_OPEN_RDONLY | RUMPUSER_OPEN_BIO, &fd);
 		if (error)
 			return error;