 @@ -1,891 +1,892 @@
-/*	$NetBSD: ukfs.c,v 1.25 2009/05/02 01:15:52 pooka Exp $	*/
+/*	$NetBSD: ukfs.c,v 1.26 2009/05/02 15:20:08 pooka Exp $	*/
 /*
  * Copyright (c) 2007, 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
  * 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.
  */
 /*
  * This library enables access to files systems directly without
  * involving system calls.
  */
 #ifdef __linux__
 #define _XOPEN_SOURCE 500
 #define _BSD_SOURCE
 #define _FILE_OFFSET_BITS 64
 #endif
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
 #include <sys/mount.h>
 #include <assert.h>
 #include <dirent.h>
 #include <dlfcn.h>
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <stdint.h>
 #include <rump/ukfs.h>
 #include <rump/rump.h>
 #include <rump/rump_syscalls.h>
 #define UKFS_MODE_DEFAULT 0555
 struct ukfs {
 	struct mount *ukfs_mp;
 	struct vnode *ukfs_rvp;
 	pthread_spinlock_t ukfs_spin;
 	pid_t ukfs_nextpid;
 	struct vnode *ukfs_cdir;
 	int ukfs_devfd;
 };
 struct mount *
 ukfs_getmp(struct ukfs *ukfs)
+{
 	return ukfs->ukfs_mp;
+}
 struct vnode *
 ukfs_getrvp(struct ukfs *ukfs)
+{
 	struct vnode *rvp;
 	rvp = ukfs->ukfs_rvp;
 	rump_vp_incref(rvp);
 	return rvp;
+}
 #ifdef DONT_WANT_PTHREAD_LINKAGE
 #define pthread_spin_lock(a)
 #define pthread_spin_unlock(a)
 #define pthread_spin_init(a,b)
 #define pthread_spin_destroy(a)
 #endif
 static pid_t
 nextpid(struct ukfs *ukfs)
+{
 	pid_t npid;
 	pthread_spin_lock(&ukfs->ukfs_spin);
 	if (ukfs->ukfs_nextpid == 0)
 		ukfs->ukfs_nextpid++;
 	npid = ukfs->ukfs_nextpid++;
 	pthread_spin_unlock(&ukfs->ukfs_spin);
 	return npid;
+}
 static void
 precall(struct ukfs *ukfs)
+{
 	struct vnode *rvp, *cvp;
 	rump_setup_curlwp(nextpid(ukfs), 1, 1);
 	rvp = ukfs_getrvp(ukfs);
 	pthread_spin_lock(&ukfs->ukfs_spin);
 	cvp = ukfs->ukfs_cdir;
 	pthread_spin_unlock(&ukfs->ukfs_spin);
 	rump_rcvp_set(rvp, cvp); /* takes refs */
 	rump_vp_rele(rvp);
+}
 static void
 postcall(struct ukfs *ukfs)
+{
 	struct vnode *rvp;
 	rvp = ukfs_getrvp(ukfs);
 	rump_rcvp_set(NULL, rvp);
 	rump_vp_rele(rvp);
 	rump_clear_curlwp();
+}
 int
 _ukfs_init(int version)
+{
 	int rv;
 	if (version != UKFS_VERSION) {
 		printf("incompatible ukfs version, %d vs. %d\n",
 		    version, UKFS_VERSION);
 		errno = EPROGMISMATCH;
 		return -1;
+	}
 	if ((rv = rump_init()) != 0) {
 		errno = rv;
 		return -1;
+	}
 	return 0;
+}
 struct ukfs *
 ukfs_mount(const char *vfsname, const char *devpath, const char *mountpath,
 	int mntflags, void *arg, size_t alen)
+{
 	struct stat sb;
 	struct ukfs *fs = NULL;
 	struct vfsops *vfsops;
 	struct mount *mp = NULL;
 	int rv = 0, devfd = -1, rdonly;
 	vfsops = rump_vfs_getopsbyname(vfsname);
 	if (vfsops == NULL) {
 		rv = ENODEV;
 		goto out;
+	}
 	/*
 	 * Try open and lock the device.  if we can't open it, assume
 	 * it's a file system which doesn't use a real device and let
 	 * it slide.  The mount will fail anyway if the fs requires a
 	 * device.
+	 *
 	 * XXX: strictly speaking this is not 100% correct, as virtual
 	 * file systems can use a device path which does exist and can
 	 * be opened.  E.g. tmpfs should be mountable multiple times
 	 * with "device" path "/swap", but now isn't.  But I think the
 	 * chances are so low that it's currently acceptable to let
 	 * this one slip.
 	 */
 	rdonly = mntflags & MNT_RDONLY;
 	devfd = open(devpath, rdonly ? O_RDONLY : O_RDWR);
 	if (devfd != -1) {
 		if (fstat(devfd, &sb) == -1) {
 			close(devfd);
 			devfd = -1;
 			rv = errno;
 			goto out;
+		}
 		/*
 		 * We do this only for non-block device since the
 		 * (NetBSD) kernel allows block device open only once.
 		 */
 		if (!S_ISBLK(sb.st_mode)) {
 			if (flock(devfd, LOCK_NB | (rdonly ? LOCK_SH:LOCK_EX))
 			    == -1) {
 				warnx("ukfs_mount: cannot get %s lock on "
 				    "device", rdonly ? "shared" : "exclusive");
 				close(devfd);
 				devfd = -1;
 				rv = errno;
 				goto out;
+			}
 		} else {
 			close(devfd);
 			devfd = -1;
+		}
+	}
 	fs = malloc(sizeof(struct ukfs));
 	if (fs == NULL) {
 		rv = ENOMEM;
 		goto out;
+	}
 	memset(fs, 0, sizeof(struct ukfs));
 	mp = rump_mnt_init(vfsops, mntflags);
 	rump_fakeblk_register(devpath);
 	rv = rump_mnt_mount(mp, mountpath, arg, &alen);
 	rump_fakeblk_deregister(devpath);
 	if (rv) {
 		goto out;
+	}
 	rv = rump_vfs_root(mp, &fs->ukfs_rvp, 0);
 	if (rv) {
 		goto out;
+	}
 	fs->ukfs_cdir = ukfs_getrvp(fs);
 	fs->ukfs_mp = mp;
 	pthread_spin_init(&fs->ukfs_spin, PTHREAD_PROCESS_SHARED);
 	fs->ukfs_devfd = devfd;
 	assert(rv == 0);
  out:
 	if (rv) {
 		if (mp)
 			rump_mnt_destroy(mp);
 		if (fs)
 			free(fs);
 		errno = rv;
 		fs = NULL;
 		if (devfd != -1) {
 			flock(devfd, LOCK_UN);
 			close(devfd);
+		}
+	}
 	return fs;
+}
 void
 ukfs_release(struct ukfs *fs, int flags)
+{
 	int rv;
 	if ((flags & UKFS_RELFLAG_NOUNMOUNT) == 0) {
 		kauth_cred_t cred;
 		rump_vp_rele(fs->ukfs_cdir);
 		rump_vp_rele(fs->ukfs_rvp);
 		cred = rump_cred_suserget();
 		rv = rump_vfs_sync(fs->ukfs_mp, 1, cred);
 		rump_cred_suserput(cred);
 		rump_vp_recycle_nokidding(ukfs_getrvp(fs));
 		rv |= rump_vfs_unmount(fs->ukfs_mp, 0);
 		assert(rv == 0);
+	}
 	rump_vfs_syncwait(fs->ukfs_mp);
 	rump_mnt_destroy(fs->ukfs_mp);
 	pthread_spin_destroy(&fs->ukfs_spin);
 	if (fs->ukfs_devfd != -1) {
 		flock(fs->ukfs_devfd, LOCK_UN);
 		close(fs->ukfs_devfd);
+	}
 	free(fs);
+}
 #define STDCALL(ukfs, thecall)						\
 	int rv = 0;							\
+									\
 	precall(ukfs);							\
 	rv = thecall;							\
 	postcall(ukfs);							\
 	return rv;
 int
 ukfs_opendir(struct ukfs *ukfs, const char *dirname, struct ukfs_dircookie **c)
+{
 	struct vnode *vp;
 	int rv;
 	precall(ukfs);
 	rv = rump_namei(RUMP_NAMEI_LOOKUP, RUMP_NAMEI_LOCKLEAF, dirname,
 	    NULL, &vp, NULL);
 	postcall(ukfs);
 	if (rv == 0) {
 		RUMP_VOP_UNLOCK(vp, 0);
 	} else {
 		errno = rv;
 		rv = -1;
+	}
 	/*LINTED*/
 	*c = (struct ukfs_dircookie *)vp;
 	return rv;
+}
 static int
 getmydents(struct vnode *vp, off_t *off, uint8_t *buf, size_t bufsize)
+{
 	struct uio *uio;
 	size_t resid;
 	int rv, eofflag;
 	kauth_cred_t cred;
 	uio = rump_uio_setup(buf, bufsize, *off, RUMPUIO_READ);
 	cred = rump_cred_suserget();
 	rv = RUMP_VOP_READDIR(vp, uio, cred, &eofflag, NULL, NULL);
 	rump_cred_suserput(cred);
 	RUMP_VOP_UNLOCK(vp, 0);
 	*off = rump_uio_getoff(uio);
 	resid = rump_uio_free(uio);
 	if (rv) {
 		errno = rv;
 		return -1;
+	}
 	/* LINTED: not totally correct return type, but follows syscall */
 	return bufsize - resid;
+}
 /*ARGSUSED*/
 int
 ukfs_getdents_cookie(struct ukfs *ukfs, struct ukfs_dircookie *c, off_t *off,
 	uint8_t *buf, size_t bufsize)
+{
 	/*LINTED*/
 	struct vnode *vp = (struct vnode *)c;
 	RUMP_VOP_LOCK(vp, RUMP_LK_SHARED);
 	return getmydents(vp, off, buf, bufsize);
+}
 int
 ukfs_getdents(struct ukfs *ukfs, const char *dirname, off_t *off,
 	uint8_t *buf, size_t bufsize)
+{
 	struct vnode *vp;
 	int rv;
 	precall(ukfs);
 	rv = rump_namei(RUMP_NAMEI_LOOKUP, RUMP_NAMEI_LOCKLEAF, dirname,
 	    NULL, &vp, NULL);
 	postcall(ukfs);
 	if (rv) {
 		errno = rv;
 		return -1;
+	}
 	rv = getmydents(vp, off, buf, bufsize);
 	rump_vp_rele(vp);
 	return rv;
+}
 /*ARGSUSED*/
 int
 ukfs_closedir(struct ukfs *ukfs, struct ukfs_dircookie *c)
+{
 	/*LINTED*/
 	rump_vp_rele((struct vnode *)c);
 	return 0;
+}
 int
 ukfs_open(struct ukfs *ukfs, const char *filename, int flags)
+{
 	int fd;
 	precall(ukfs);
 	fd = rump_sys_open(filename, flags, 0);
 	postcall(ukfs);
 	if (fd == -1)
 		return -1;
 	return fd;
+}
 ssize_t
 ukfs_read(struct ukfs *ukfs, const char *filename, off_t off,
 	uint8_t *buf, size_t bufsize)
+{
 	int fd;
 	ssize_t xfer = -1; /* XXXgcc */
 	precall(ukfs);
 	fd = rump_sys_open(filename, RUMP_O_RDONLY, 0);
 	if (fd == -1)
 		goto out;
 	xfer = rump_sys_pread(fd, buf, bufsize, 0, off);
 	rump_sys_close(fd);
  out:
 	postcall(ukfs);
 	if (fd == -1) {
 		return -1;
+	}
 	return xfer;
+}
 /*ARGSUSED*/
 ssize_t
 ukfs_read_fd(struct ukfs *ukfs, int fd, off_t off, uint8_t *buf, size_t buflen)
+{
 	return rump_sys_pread(fd, buf, buflen, 0, off);
+}
 ssize_t
 ukfs_write(struct ukfs *ukfs, const char *filename, off_t off,
 	uint8_t *buf, size_t bufsize)
+{
 	int fd;
 	ssize_t xfer = -1; /* XXXgcc */
 	precall(ukfs);
 	fd = rump_sys_open(filename, RUMP_O_WRONLY, 0);
 	if (fd == -1)
 		goto out;
 	/* write and commit */
 	xfer = rump_sys_pwrite(fd, buf, bufsize, 0, off);
 	if (xfer > 0)
 		rump_sys_fsync(fd);
 	rump_sys_close(fd);
  out:
 	postcall(ukfs);
 	if (fd == -1) {
 		return -1;
+	}
 	return xfer;
+}
 /*ARGSUSED*/
 ssize_t
 ukfs_write_fd(struct ukfs *ukfs, int fd, off_t off, uint8_t *buf, size_t buflen,
 	int dosync)
+{
 	ssize_t xfer;
 	xfer = rump_sys_pwrite(fd, buf, buflen, 0, off);
 	if (xfer > 0 && dosync)
 		rump_sys_fsync(fd);
 	return xfer;
+}
 /*ARGSUSED*/
 int
 ukfs_close(struct ukfs *ukfs, int fd)
+{
 	rump_sys_close(fd);
 	return 0;
+}
 int
 ukfs_create(struct ukfs *ukfs, const char *filename, mode_t mode)
+{
 	int fd;
 	precall(ukfs);
 	fd = rump_sys_open(filename, RUMP_O_WRONLY | RUMP_O_CREAT, mode);
 	if (fd == -1)
 		return -1;
 	rump_sys_close(fd);
 	postcall(ukfs);
 	return 0;
+}
 int
 ukfs_mknod(struct ukfs *ukfs, const char *path, mode_t mode, dev_t dev)
+{
 	STDCALL(ukfs, rump_sys_mknod(path, mode, dev));
+}
 int
 ukfs_mkfifo(struct ukfs *ukfs, const char *path, mode_t mode)
+{
 	STDCALL(ukfs, rump_sys_mkfifo(path, mode));
+}
 int
 ukfs_mkdir(struct ukfs *ukfs, const char *filename, mode_t mode)
+{
 	STDCALL(ukfs, rump_sys_mkdir(filename, mode));
+}
 int
 ukfs_remove(struct ukfs *ukfs, const char *filename)
+{
 	STDCALL(ukfs, rump_sys_unlink(filename));
+}
 int
 ukfs_rmdir(struct ukfs *ukfs, const char *filename)
+{
 	STDCALL(ukfs, rump_sys_rmdir(filename));
+}
 int
 ukfs_link(struct ukfs *ukfs, const char *filename, const char *f_create)
+{
 	STDCALL(ukfs, rump_sys_link(filename, f_create));
+}
 int
 ukfs_symlink(struct ukfs *ukfs, const char *filename, const char *linkname)
+{
 	STDCALL(ukfs, rump_sys_symlink(filename, linkname));
+}
 ssize_t
 ukfs_readlink(struct ukfs *ukfs, const char *filename,
 	char *linkbuf, size_t buflen)
+{
 	ssize_t rv;
 	precall(ukfs);
 	rv = rump_sys_readlink(filename, linkbuf, buflen);
 	postcall(ukfs);
 	return rv;
+}
 int
 ukfs_rename(struct ukfs *ukfs, const char *from, const char *to)
+{
 	STDCALL(ukfs, rump_sys_rename(from, to));
+}
 int
 ukfs_chdir(struct ukfs *ukfs, const char *path)
+{
 	struct vnode *newvp, *oldvp;
 	int rv;
 	precall(ukfs);
 	rv = rump_sys_chdir(path);
 	if (rv == -1)
 		goto out;
 	newvp = rump_cdir_get();
 	pthread_spin_lock(&ukfs->ukfs_spin);
 	oldvp = ukfs->ukfs_cdir;
 	ukfs->ukfs_cdir = newvp;
 	pthread_spin_unlock(&ukfs->ukfs_spin);
 	if (oldvp)
 		rump_vp_rele(oldvp);
  out:
 	postcall(ukfs);
 	return rv;
+}
 int
 ukfs_stat(struct ukfs *ukfs, const char *filename, struct stat *file_stat)
+{
 	STDCALL(ukfs, rump_sys_stat(filename, file_stat));
+}
 int
 ukfs_lstat(struct ukfs *ukfs, const char *filename, struct stat *file_stat)
+{
 	STDCALL(ukfs, rump_sys_lstat(filename, file_stat));
+}
 int
 ukfs_chmod(struct ukfs *ukfs, const char *filename, mode_t mode)
+{
 	STDCALL(ukfs, rump_sys_chmod(filename, mode));
+}
 int
 ukfs_lchmod(struct ukfs *ukfs, const char *filename, mode_t mode)
+{
 	STDCALL(ukfs, rump_sys_lchmod(filename, mode));
+}
 int
 ukfs_chown(struct ukfs *ukfs, const char *filename, uid_t uid, gid_t gid)
+{
 	STDCALL(ukfs, rump_sys_chown(filename, uid, gid));
+}
 int
 ukfs_lchown(struct ukfs *ukfs, const char *filename, uid_t uid, gid_t gid)
+{
 	STDCALL(ukfs, rump_sys_lchown(filename, uid, gid));
+}
 int
 ukfs_chflags(struct ukfs *ukfs, const char *filename, u_long flags)
+{
 	STDCALL(ukfs, rump_sys_chflags(filename, flags));
+}
 int
 ukfs_lchflags(struct ukfs *ukfs, const char *filename, u_long flags)
+{
 	STDCALL(ukfs, rump_sys_lchflags(filename, flags));
+}
 int
 ukfs_utimes(struct ukfs *ukfs, const char *filename, const struct timeval *tptr)
+{
 	STDCALL(ukfs, rump_sys_utimes(filename, tptr));
+}
 int
 ukfs_lutimes(struct ukfs *ukfs, const char *filename,
 	      const struct timeval *tptr)
+{
 	STDCALL(ukfs, rump_sys_lutimes(filename, tptr));
+}
 /*
  * Dynamic module support
  */
 /* load one library */
 /*
  * XXX: the dlerror stuff isn't really threadsafe, but then again I
  * can't protect against other threads calling dl*() outside of ukfs,
  * so just live with it being flimsy
  */
 int
 ukfs_modload(const char *fname)
+{
-	void *handle, *thesym;
+	void *handle;
 	struct modinfo **mi;
 	struct stat sb;
 	int error;
 	if (stat(fname, &sb) == -1)
 		return -1;
 	handle = dlopen(fname, RTLD_GLOBAL);
 	if (handle == NULL) {
 		const char *dlmsg = dlerror();
 		if (strstr(dlmsg, "Undefined symbol"))
 			return 0;
 		warnx("dlopen %s failed: %s\n", fname, dlmsg);
 		/* XXXerrno */
 		return -1;
+	}
-	thesym = dlsym(handle, "__start_link_set_modules");
+	mi = dlsym(handle, "__start_link_set_modules");
-	if (thesym) {
+	if (mi) {
-		error = rump_module_load(thesym);
+		error = rump_module_init(*mi, NULL);
 		if (error)
 			goto errclose;
 		return 1;
+	}
 	error = EINVAL;
  errclose:
 	dlclose(handle);
 	errno = error;
 	return -1;
+}
 struct loadfail {
 	char *pname;
 	LIST_ENTRY(loadfail) entries;
 };
 #define RUMPFSMOD_PREFIX "librumpfs_"
 #define RUMPFSMOD_SUFFIX ".so"
 int
 ukfs_modload_dir(const char *dir)
+{
 	char nbuf[MAXPATHLEN+1], *p;
 	struct dirent entry, *result;
 	DIR *libdir;
 	struct loadfail *lf, *nlf;
 	int error, nloaded = 0, redo;
 	LIST_HEAD(, loadfail) lfs;
 	libdir = opendir(dir);
 	if (libdir == NULL)
 		return -1;
 	LIST_INIT(&lfs);
 	for (;;) {
 		if ((error = readdir_r(libdir, &entry, &result)) != 0)
 			break;
 		if (!result)
 			break;
 		if (strncmp(result->d_name, RUMPFSMOD_PREFIX,
 		    strlen(RUMPFSMOD_PREFIX)) != 0)
 			continue;
 		if (((p = strstr(result->d_name, RUMPFSMOD_SUFFIX)) == NULL)
 		    || strlen(p) != strlen(RUMPFSMOD_SUFFIX))
 			continue;
 		strlcpy(nbuf, dir, sizeof(nbuf));
 		strlcat(nbuf, "/", sizeof(nbuf));
 		strlcat(nbuf, result->d_name, sizeof(nbuf));
 		switch (ukfs_modload(nbuf)) {
 		case 0:
 			lf = malloc(sizeof(*lf));
 			if (lf == NULL) {
 				error = ENOMEM;
 				break;
+			}
 			lf->pname = strdup(nbuf);
 			if (lf->pname == NULL) {
 				free(lf);
 				error = ENOMEM;
 				break;
+			}
 			LIST_INSERT_HEAD(&lfs, lf, entries);
 			break;
 		case 1:
 			nloaded++;
 			break;
 		default:
 			/* ignore errors */
 			break;
+		}
+	}
 	closedir(libdir);
 	if (error && nloaded != 0)
 		error = 0;
 	/*
 	 * El-cheapo dependency calculator.  Just try to load the
 	 * modules n times in a loop
 	 */
 	for (redo = 1; redo;) {
 		redo = 0;
 		nlf = LIST_FIRST(&lfs);
 		while ((lf = nlf) != NULL) {
 			nlf = LIST_NEXT(lf, entries);
 			if (ukfs_modload(lf->pname) == 1) {
 				nloaded++;
 				redo = 1;
 				LIST_REMOVE(lf, entries);
 				free(lf->pname);
 				free(lf);
+			}
+		}
+	}
 	while ((lf = LIST_FIRST(&lfs)) != NULL) {
 		LIST_REMOVE(lf, entries);
 		free(lf->pname);
 		free(lf);
+	}
 	if (error && nloaded == 0) {
 		errno = error;
 		return -1;
+	}
 	return nloaded;
+}
 /* XXX: this code uses definitions from NetBSD, needs rumpdefs */
 ssize_t
 ukfs_vfstypes(char *buf, size_t buflen)
+{
 	int mib[3];
 	struct sysctlnode q, ans[128];
 	size_t alen;
 	int i;
 	mib[0] = CTL_VFS;
 	mib[1] = VFS_GENERIC;
 	mib[2] = CTL_QUERY;
 	alen = sizeof(ans);
 	memset(&q, 0, sizeof(q));
 	q.sysctl_flags = SYSCTL_VERSION;
 	if (rump_sys___sysctl(mib, 3, ans, &alen, &q, sizeof(q)) == -1) {
 		return -1;
+	}
 	for (i = 0; i < alen/sizeof(ans[0]); i++)
 		if (strcmp("fstypes", ans[i].sysctl_name) == 0)
 			break;
 	if (i == alen/sizeof(ans[0])) {
 		errno = ENXIO;
 		return -1;
+	}
 	mib[0] = CTL_VFS;
 	mib[1] = VFS_GENERIC;
 	mib[2] = ans[i].sysctl_num;
 	if (rump_sys___sysctl(mib, 3, buf, &buflen, NULL, 0) == -1) {
 		return -1;
+	}
 	return buflen;
+}
 /*
  * Utilities
  */
 int
 ukfs_util_builddirs(struct ukfs *ukfs, const char *pathname, mode_t mode)
+{
 	char *f1, *f2;
 	int rv;
 	mode_t mask;
 	bool end;
 	/*ukfs_umask((mask = ukfs_umask(0)));*/
 	umask((mask = umask(0)));
 	f1 = f2 = strdup(pathname);
 	if (f1 == NULL) {
 		errno = ENOMEM;
 		return -1;
+	}
 	end = false;
 	for (;;) {
 		/* find next component */
 		f2 += strspn(f2, "/");
 		f2 += strcspn(f2, "/");
 		if (*f2 == '\0')
 			end = true;
 		else
 			*f2 = '\0';
 		rv = ukfs_mkdir(ukfs, f1, mode & ~mask);
 		if (errno == EEXIST)
 			rv = 0;
 		if (rv == -1 || *f2 != '\0' || end)
 			break;
 		*f2 = '/';
+	}
 	free(f1);
 	return rv;
+}

 @@ -1,182 +1,190 @@
-/*	$NetBSD: rump.h,v 1.13 2009/04/29 18:00:49 pooka Exp $	*/
+/*	$NetBSD: rump.h,v 1.14 2009/05/02 15:20:08 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code.
+ *
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
  * 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.
  */
 #ifndef _RUMP_RUMP_H_
 #define _RUMP_RUMP_H_
 /*
  * NOTE: do not #include anything from <sys> here.  Otherwise this
  * has no chance of working on non-NetBSD platforms.
  */
 struct mount;
 struct vnode;
 struct vattr;
 struct componentname;
 struct vfsops;
 struct fid;
 struct statvfs;
 /* yetch */
 #if !defined(_RUMPKERNEL) && !defined(__NetBSD__)
 struct kauth_cred;
 typedef struct kauth_cred *kauth_cred_t;
 #endif
 #if defined(__NetBSD__)
 #include <prop/proplib.h>
 #else
 struct prop_dictionary;
 typedef struct prop_dictionary *prop_dictionary_t;
 #endif /* __NetBSD__ */
 struct lwp;
 struct modinfo;
 #include <rump/rumpvnode_if.h>
 #include <rump/rumpdefs.h>
 #ifndef curlwp
 #define curlwp rump_get_curlwp()
 #endif
 /*
  * Something like rump capabilities would be nicer, but let's
  * do this for a start.
  */
 #define RUMP_VERSION	01
 #define rump_init()	rump__init(RUMP_VERSION)
-int	rump_module_load(struct modinfo **);
+int	rump_module_init(struct modinfo *, prop_dictionary_t props);
 int	rump_module_fini(struct modinfo *);
 int		rump__init(int);
 struct mount	*rump_mnt_init(struct vfsops *, int);
 int		rump_mnt_mount(struct mount *, const char *, void *, size_t *);
 void		rump_mnt_destroy(struct mount *);
 struct componentname	*rump_makecn(u_long, u_long, const char *, size_t,
 				     kauth_cred_t, struct lwp *);
 void			rump_freecn(struct componentname *, int);
 #define RUMPCN_ISLOOKUP 0x01
 #define RUMPCN_FREECRED 0x02
 #define RUMPCN_HASNTBUF 0x04
 int			rump_namei(uint32_t, uint32_t, const char *,
 				   struct vnode **, struct vnode **,
 				   struct componentname **);
 void 	rump_getvninfo(struct vnode *, enum vtype *, off_t * /*XXX*/, dev_t *);
 int	rump_fakeblk_register(const char *);
 int	rump_fakeblk_find(const char *);
 void	rump_fakeblk_deregister(const char *);
 struct vfsops	*rump_vfslist_iterate(struct vfsops *);
 struct vfsops	*rump_vfs_getopsbyname(const char *);
 struct vattr	*rump_vattr_init(void);
 void		rump_vattr_settype(struct vattr *, enum vtype);
 void		rump_vattr_setmode(struct vattr *, mode_t);
 void		rump_vattr_setrdev(struct vattr *, dev_t);
 void		rump_vattr_free(struct vattr *);
 void		rump_vp_incref(struct vnode *);
 int		rump_vp_getref(struct vnode *);
 void		rump_vp_decref(struct vnode *);
 void		rump_vp_recycle_nokidding(struct vnode *);
 void		rump_vp_rele(struct vnode *);
 enum rump_uiorw { RUMPUIO_READ, RUMPUIO_WRITE };
 struct uio	*rump_uio_setup(void *, size_t, off_t, enum rump_uiorw);
 size_t		rump_uio_getresid(struct uio *);
 off_t		rump_uio_getoff(struct uio *);
 size_t		rump_uio_free(struct uio *);
 void	rump_vp_interlock(struct vnode *);
 kauth_cred_t	rump_cred_create(uid_t, gid_t, size_t, gid_t *);
 kauth_cred_t	rump_cred_suserget(void);
 void		rump_cred_destroy(kauth_cred_t);
 #define rump_cred_suserput(c)	rump_cred_destroy(c)
 /* COMPAT_NETHACK */
 #define WizardMode()		rump_cred_suserget()
 #define YASD(cred)		rump_cred_suserput(cred)
 int	rump_vfs_unmount(struct mount *, int);
 int	rump_vfs_root(struct mount *, struct vnode **, int);
 int	rump_vfs_statvfs(struct mount *, struct statvfs *);
 int	rump_vfs_sync(struct mount *, int, kauth_cred_t);
 int	rump_vfs_fhtovp(struct mount *, struct fid *, struct vnode **);
 int	rump_vfs_vptofh(struct vnode *, struct fid *, size_t *);
 void	rump_vfs_syncwait(struct mount *);
 struct lwp	*rump_newproc_switch(void);
 struct lwp	*rump_setup_curlwp(pid_t, lwpid_t, int);
 struct lwp	*rump_get_curlwp(void);
 void		rump_clear_curlwp(void);
 void		rump_rcvp_set(struct vnode *, struct vnode *);
 struct vnode 	*rump_cdir_get(void);
 /* I picked the wrong header to stop sniffin' glue */
 int rump_syspuffs_glueinit(int, int *);
 int rump_virtif_create(int);
 typedef int (*rump_sysproxy_t)(int, void *, uint8_t *, size_t, register_t *);
 int		rump_sysproxy_set(rump_sysproxy_t, void *);
 int		rump_sysproxy_socket_setup_client(int);
 int		rump_sysproxy_socket_setup_server(int);
 /*
  * Begin rump syscall conditionals.  Yes, something a little better
  * is required here.
  */
 #ifdef RUMP_SYS_NETWORKING
 #define socket(a,b,c) rump_sys_socket(a,b,c)
 #define accept(a,b,c) rump_sys_accept(a,b,c)
 #define bind(a,b,c) rump_sys_bind(a,b,c)
 #define connect(a,b,c) rump_sys_connect(a,b,c)
 #define getpeername(a,b,c) rump_sys_getpeername(a,b,c)
 #define getsockname(a,b,c) rump_sys_getsockname(a,b,c)
 #define listen(a,b) rump_sys_listen(a,b)
 #define recvfrom(a,b,c,d,e,f) rump_sys_recvfrom(a,b,c,d,e,f)
 #define sendto(a,b,c,d,e,f) rump_sys_sendto(a,b,c,d,e,f)
 #define getsockopt(a,b,c,d,e) rump_sys_getsockopt(a,b,c,d,e)
 #define setsockopt(a,b,c,d,e) rump_sys_setsockopt(a,b,c,d,e)
 #define shutdown(a,b) rump_sys_shutdown(a,b)
 #endif /* RUMP_SYS_NETWORKING */
 #ifdef RUMP_SYS_CLOSE
 #define close(a) rump_sys_close(a)
 #endif /* RUMP_SYS_CLOSE */
 #ifdef RUMP_SYS_READWRITE
 #define read(a,b,c) rump_sys_read(a,b,c)
 #define readv(a,b,c) rump_sys_readv(a,b,c)
 #define pread(a,b,c,d) rump_sys_pread(a,b,c,d)
 #define preadv(a,b,c,d) rump_sys_preadv(a,b,c,d)
 #define write(a,b,c) rump_sys_write(a,b,c)
 #define writev(a,b,c) rump_sys_writev(a,b,c)
 #define pwrite(a,b,c,d) rump_sys_pwrite(a,b,c,d)
 #define pwritev(a,b,c,d) rump_sys_pwritev(a,b,c,d)
 #endif /* RUMP_SYS_READWRITE */
 #endif /* _RUMP_RUMP_H_ */

 @@ -1,538 +1,545 @@
-/*	$NetBSD: rump.c,v 1.105 2009/04/30 16:59:32 pooka Exp $	*/
+/*	$NetBSD: rump.c,v 1.106 2009/05/02 15:20:08 pooka Exp $	*/
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
+ *
  * Development of this software was supported by Google Summer of Code.
+ *
  * 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.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
  * 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.c,v 1.105 2009/04/30 16:59:32 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.106 2009/05/02 15:20:08 pooka Exp $");
 #include <sys/param.h>
 #include <sys/atomic.h>
 #include <sys/buf.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 #include <sys/cpu.h>
 #include <sys/evcnt.h>
 #include <sys/event.h>
 #include <sys/filedesc.h>
 #include <sys/iostat.h>
 #include <sys/kauth.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/kprintf.h>
 #include <sys/ksyms.h>
 #include <sys/msgbuf.h>
 #include <sys/module.h>
 #include <sys/once.h>
 #include <sys/percpu.h>
 #include <sys/queue.h>
 #include <sys/resourcevar.h>
 #include <sys/select.h>
 #include <sys/sysctl.h>
 #include <sys/syscall.h>
 #include <sys/tty.h>
 #include <sys/uidinfo.h>
 #include <sys/vmem.h>
 #include <rump/rumpuser.h>
 #include <secmodel/secmodel.h>
 #include "rump_private.h"
 #include "rump_net_private.h"
 #include "rump_vfs_private.h"
 struct proc proc0;
 struct session rump_session = {
 	.s_count = 1,
 	.s_flags = 0,
 	.s_leader = &proc0,
 	.s_login = "rumphobo",
 	.s_sid = 0,
 };
 struct pgrp rump_pgrp = {
 	.pg_members = LIST_HEAD_INITIALIZER(pg_members),
 	.pg_session = &rump_session,
 	.pg_jobc = 1,
 };
 struct pstats rump_stats;
 struct plimit rump_limits;
 struct cpu_info rump_cpu;
 struct filedesc rump_filedesc0;
 struct proclist allproc;
 char machine[] = "rump";
 static kauth_cred_t rump_susercred;
 /* pretend the master rump proc is init */
 struct proc *initproc = &proc0;
 struct rumpuser_mtx *rump_giantlock;
 sigset_t sigcantmask;
 #ifdef RUMP_WITHOUT_THREADS
 int rump_threads = 0;
 #else
 int rump_threads = 1;
 #endif
 static void
 rump_aiodone_worker(struct work *wk, void *dummy)
+{
 	struct buf *bp = (struct buf *)wk;
 	KASSERT(&bp->b_work == wk);
 	bp->b_iodone(bp);
+}
 static int rump_inited;
 static struct emul emul_rump;
 void rump__unavailable(void);
 void rump__unavailable() {}
 __weak_alias(rump_net_init,rump__unavailable);
 __weak_alias(rump_vfs_init,rump__unavailable);
 void rump__unavailable_vfs_panic(void);
 void rump__unavailable_vfs_panic() {panic("vfs component not available");}
 __weak_alias(vn_open,rump__unavailable_vfs_panic);
 __weak_alias(vn_rdwr,rump__unavailable_vfs_panic);
 __weak_alias(vn_close,rump__unavailable_vfs_panic);
 static void
 pvfsinit_nop(struct proc *p)
+{
 	return;
+}
 static void
 pvfsrele_nop(struct proc *p)
+{
 	return;
+}
 rump_proc_vfs_init_fn rump_proc_vfs_init = pvfsinit_nop;
 rump_proc_vfs_release_fn rump_proc_vfs_release = pvfsrele_nop;
 /*
  * Stir up the stack a bit.  These are exported functions to help
  * convince the compiler that we don't want these routines completely
  * optimized out or inlined.  Is there an easier way to do this?
  */
 void nullfn(uint32_t *);
 void nullfn(uint32_t *arg){}
 void messthestack(void);
 void
 messthestack(void)
+{
 	uint32_t mess[64];
 	uint64_t d1, d2;
 	int i, error;
 	for (i = 0; i < 64; i++) {
 		rumpuser_gettime(&d1, &d2, &error);
 		mess[i] = d2;
+	}
 	nullfn(mess);
+}
 int
 rump__init(int rump_version)
+{
 	char buf[256];
 	struct proc *p;
 	struct lwp *l;
 	int error;
 	/* XXX */
 	if (rump_inited)
 		return 0;
 	rump_inited = 1;
 	/*
 	 * Seed arc4random() with a "reasonable" amount of randomness.
 	 * Yes, this is a quick kludge which depends on the arc4random
 	 * implementation.
 	 */
 	messthestack();
 	arc4random();
 	if (rump_version != RUMP_VERSION) {
 		printf("rump version mismatch, %d vs. %d\n",
 		    rump_version, RUMP_VERSION);
 		return EPROGMISMATCH;
+	}
 	if (rumpuser_getenv("RUMP_THREADS", buf, sizeof(buf), &error) == 0) {
 		rump_threads = *buf != '0';
+	}
 	rumpuser_thrinit(_kernel_lock, _kernel_unlock, rump_threads);
 	mutex_init(&tty_lock, MUTEX_DEFAULT, IPL_NONE);
 	rumpuser_mutex_recursive_init(&rump_giantlock);
 	ksyms_init();
 	rumpvm_init();
 	evcnt_init();
 	once_init();
 	rump_sleepers_init();
 	pool_subsystem_init();
 	kmem_init();
 	kprintf_init();
 	loginit();
 	kauth_init();
 	rump_susercred = rump_cred_create(0, 0, 0, NULL);
 	l = &lwp0;
 	p = &proc0;
 	p->p_stats = &rump_stats;
 	p->p_limit = &rump_limits;
 	p->p_pgrp = &rump_pgrp;
 	p->p_pid = 0;
 	p->p_fd = &rump_filedesc0;
 	p->p_vmspace = &rump_vmspace;
 	p->p_emul = &emul_rump;
 	p->p_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
 	l->l_cred = rump_cred_suserget();
 	l->l_proc = p;
 	l->l_lid = 1;
 	LIST_INIT(&allproc);
 	LIST_INSERT_HEAD(&allproc, &proc0, p_list);
 	proc_lock = mutex_obj_alloc(MUTEX_DEFAULT, IPL_NONE);
 	rump_limits.pl_rlimit[RLIMIT_FSIZE].rlim_cur = RLIM_INFINITY;
 	rump_limits.pl_rlimit[RLIMIT_NOFILE].rlim_cur = RLIM_INFINITY;
 	rump_limits.pl_rlimit[RLIMIT_SBSIZE].rlim_cur = RLIM_INFINITY;
 	callout_startup();
 	callout_init_cpu(&rump_cpu);
 	kqueue_init();
 	iostat_init();
 	uid_init();
 	percpu_init();
 	fd_sys_init();
 	module_init();
 	sysctl_init();
 	softint_init(&rump_cpu);
 	cold = 0;
 	devsw_init();
 	secmodel_start();
 	/* these do nothing if not present */
 	rump_vfs_init();
 	rump_net_init();
 	/* aieeeedondest */
 	if (rump_threads) {
 		if (workqueue_create(&uvm.aiodone_queue, "aiodoned",
 		    rump_aiodone_worker, NULL, 0, 0, 0))
 			panic("aiodoned");
+	}
 	rumpuser_gethostname(hostname, MAXHOSTNAMELEN, &error);
 	hostnamelen = strlen(hostname);
 	sigemptyset(&sigcantmask);
 	lwp0.l_fd = proc0.p_fd = fd_init(&rump_filedesc0);
 #ifdef RUMP_USE_REAL_ALLOCATORS
 	if (rump_threads)
 		vmem_rehash_start();
 #endif
 	return 0;
+}
 struct uio *
 rump_uio_setup(void *buf, size_t bufsize, off_t offset, enum rump_uiorw rw)
+{
 	struct uio *uio;
 	enum uio_rw uiorw;
 	switch (rw) {
 	case RUMPUIO_READ:
 		uiorw = UIO_READ;
 		break;
 	case RUMPUIO_WRITE:
 		uiorw = UIO_WRITE;
 		break;
 	default:
 		panic("%s: invalid rw %d", __func__, rw);
+	}
 	uio = kmem_alloc(sizeof(struct uio), KM_SLEEP);
 	uio->uio_iov = kmem_alloc(sizeof(struct iovec), KM_SLEEP);
 	uio->uio_iov->iov_base = buf;
 	uio->uio_iov->iov_len = bufsize;
 	uio->uio_iovcnt = 1;
 	uio->uio_offset = offset;
 	uio->uio_resid = bufsize;
 	uio->uio_rw = uiorw;
 	uio->uio_vmspace = UIO_VMSPACE_SYS;
 	return uio;
+}
 size_t
 rump_uio_getresid(struct uio *uio)
+{
 	return uio->uio_resid;
+}
 off_t
 rump_uio_getoff(struct uio *uio)
+{
 	return uio->uio_offset;
+}
 size_t
 rump_uio_free(struct uio *uio)
+{
 	size_t resid;
 	resid = uio->uio_resid;
 	kmem_free(uio->uio_iov, sizeof(*uio->uio_iov));
 	kmem_free(uio, sizeof(*uio));
 	return resid;
+}
 /* public interface */
 static pid_t nextpid = 1;
 struct lwp *
 rump_newproc_switch()
+{
 	struct lwp *oldlwp = curlwp;
 	pid_t mypid;
 	mypid = atomic_inc_uint_nv(&nextpid);
 	if (__predict_false(mypid == 0))
 		mypid = atomic_inc_uint_nv(&nextpid);
 	rumpuser_set_curlwp(NULL);
 	rump_setup_curlwp(mypid, 0, 1);
 	return oldlwp;
+}
 /* rump private */
 struct lwp *
 rump_setup_curlwp(pid_t pid, lwpid_t lid, int set)
+{
 	struct lwp *l;
 	struct proc *p;
 	l = kmem_zalloc(sizeof(struct lwp), KM_SLEEP);
 	if (pid != 0) {
 		p = kmem_zalloc(sizeof(struct proc), KM_SLEEP);
 		rump_proc_vfs_init(p);
 		p->p_stats = &rump_stats;
 		p->p_limit = &rump_limits;
 		p->p_pid = pid;
 		p->p_vmspace = &rump_vmspace;
 		p->p_fd = fd_init(NULL);
 	} else {
 		p = &proc0;
+	}
 	l->l_cred = rump_cred_suserget();
 	l->l_proc = p;
 	l->l_lid = lid;
 	l->l_fd = p->p_fd;
 	l->l_mutex = RUMP_LMUTEX_MAGIC;
 	l->l_cpu = &rump_cpu;
 	if (set)
 		rumpuser_set_curlwp(l);
 	return l;
+}
 /* rump private.  NEEDS WORK! */
 void
 rump_set_vmspace(struct vmspace *vm)
+{
 	struct proc *p = curproc;
 	p->p_vmspace = vm;
+}
 void
 rump_clear_curlwp(void)
+{
 	struct lwp *l;
 	struct proc *p;
 	l = rumpuser_get_curlwp();
 	p = l->l_proc;
 	if (p->p_pid != 0) {
 		fd_free();
 		rump_proc_vfs_release(p);
 		rump_cred_destroy(l->l_cred);
 		kmem_free(p, sizeof(*p));
+	}
 	kmem_free(l, sizeof(*l));
 	rumpuser_set_curlwp(NULL);
+}
 struct lwp *
 rump_get_curlwp(void)
+{
 	struct lwp *l;
 	l = rumpuser_get_curlwp();
 	if (l == NULL)
 		l = &lwp0;
 	return l;
+}
 kauth_cred_t
 rump_cred_create(uid_t uid, gid_t gid, size_t ngroups, gid_t *groups)
+{
 	kauth_cred_t cred;
 	int rv;
 	cred = kauth_cred_alloc();
 	kauth_cred_setuid(cred, uid);
 	kauth_cred_seteuid(cred, uid);
 	kauth_cred_setsvuid(cred, uid);
 	kauth_cred_setgid(cred, gid);
 	kauth_cred_setgid(cred, gid);
 	kauth_cred_setegid(cred, gid);
 	kauth_cred_setsvgid(cred, gid);
 	rv = kauth_cred_setgroups(cred, groups, ngroups, 0, UIO_SYSSPACE);
 	/* oh this is silly.  and by "this" I mean kauth_cred_setgroups() */
 	assert(rv == 0);
 	return cred;
+}
 void
 rump_cred_destroy(kauth_cred_t cred)
+{
 	kauth_cred_free(cred);
+}
 kauth_cred_t
 rump_cred_suserget(void)
+{
 	kauth_cred_hold(rump_susercred);
 	return rump_susercred;
+}
 /*
  * Return the next system lwpid
  */
 lwpid_t
 rump_nextlid(void)
+{
 	lwpid_t retid;
 	mutex_enter(proc0.p_lock);
 	/*
 	 * Take next one, don't return 0
 	 * XXX: most likely we'll have collisions in case this
 	 * wraps around.
 	 */
 	if (++proc0.p_nlwpid == 0)
 		++proc0.p_nlwpid;
 	retid = proc0.p_nlwpid;
 	mutex_exit(proc0.p_lock);
 	return retid;
+}
 int
-rump_module_load(struct modinfo **mi)
+rump_module_init(struct modinfo *mi, prop_dictionary_t props)
+{
-	if (!module_compatible((*mi)->mi_version, __NetBSD_Version__))
+	if (!module_compatible(mi->mi_version, __NetBSD_Version__))
 		return EPROGMISMATCH;
-	return (*mi)->mi_modcmd(MODULE_CMD_INIT, NULL);
+	return mi->mi_modcmd(MODULE_CMD_INIT, props);
+}
 int
 rump_module_fini(struct modinfo *mi)
+{
 	return mi->mi_modcmd(MODULE_CMD_FINI, NULL);
+}
 int _syspuffs_stub(int, int *);
 int
 _syspuffs_stub(int fd, int *newfd)
+{
 	return ENODEV;
+}
 __weak_alias(rump_syspuffs_glueinit,_syspuffs_stub);
 static int
 rump_sysproxy_local(int num, void *arg, uint8_t *data, size_t dlen,
 	register_t *retval)
+{
 	struct lwp *l;
 	struct sysent *callp;
 	if (__predict_false(num >= SYS_NSYSENT))
 		return ENOSYS;
 	l = curlwp;
 	callp = rump_sysent + num;
 	return callp->sy_call(l, (void *)data, retval);
+}
 rump_sysproxy_t rump_sysproxy = rump_sysproxy_local;
 void *rump_sysproxy_arg;
 /*
  * This whole syscall-via-rpc is still taking form.  For example, it
  * may be necessary to set syscalls individually instead of lobbing
  * them all to the same place.  So don't think this interface is
  * set in stone.
  */
 int
 rump_sysproxy_set(rump_sysproxy_t proxy, void *arg)
+{
 	if (rump_sysproxy_arg)
 		return EBUSY;
 	rump_sysproxy_arg = arg;
 	rump_sysproxy = proxy;
 	return 0;
+}