Module Name: src
Committed By: pooka
Date: Wed Oct 14 18:22:50 UTC 2009
Modified Files:
src/lib/libp2k: p2k.c
src/lib/libukfs: ukfs.c
src/tests/fs/ffs: t_renamerace.c
src/tests/syscall: t_cmsg.c
src/usr.sbin/puffs/rump_lfs: rump_lfs.c
Log Message:
Adjust names of external rump control interfaces to match the
new rump_pub namespace.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/lib/libp2k/p2k.c
cvs rdiff -u -r1.39 -r1.40 src/lib/libukfs/ukfs.c
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/ffs/t_renamerace.c
cvs rdiff -u -r1.7 -r1.8 src/tests/syscall/t_cmsg.c
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/puffs/rump_lfs/rump_lfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libp2k/p2k.c
diff -u src/lib/libp2k/p2k.c:1.22 src/lib/libp2k/p2k.c:1.23
--- src/lib/libp2k/p2k.c:1.22 Tue Oct 13 20:06:38 2009
+++ src/lib/libp2k/p2k.c Wed Oct 14 18:22:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: p2k.c,v 1.22 2009/10/13 20:06:38 pooka Exp $ */
+/* $NetBSD: p2k.c,v 1.23 2009/10/14 18:22:50 pooka Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -108,14 +108,14 @@
puffs_cred_getgroups(pcr, groups, &ngroups);
/* LINTED: ngroups is ok */
- return rump_cred_create(uid, gid, ngroups, groups);
+ return rump_pub_cred_create(uid, gid, ngroups, groups);
}
static __inline void
cred_destroy(kauth_cred_t cred)
{
- rump_cred_put(cred);
+ rump_pub_cred_put(cred);
}
static struct componentname *
@@ -125,15 +125,15 @@
cred = cred_create(pcn->pcn_cred);
/* LINTED: prehistoric types in first two args */
- return rump_makecn(pcn->pcn_nameiop, pcn->pcn_flags | myflags,
- pcn->pcn_name, pcn->pcn_namelen, cred, rump_get_curlwp());
+ return rump_pub_makecn(pcn->pcn_nameiop, pcn->pcn_flags | myflags,
+ pcn->pcn_name, pcn->pcn_namelen, cred, rump_pub_get_curlwp());
}
static __inline void
freecn(struct componentname *cnp, int flags)
{
- rump_freecn(cnp, flags | RUMPCN_FREECRED);
+ rump_pub_freecn(cnp, flags | RUMPCN_FREECRED);
}
static void
@@ -143,7 +143,7 @@
lwpid_t lid;
puffs_cc_getcaller(puffs_cc_getcc(pu), &pid, &lid);
- rump_setup_curlwp(pid, lid, 1);
+ rump_pub_setup_curlwp(pid, lid, 1);
}
/*ARGSUSED*/
@@ -151,7 +151,7 @@
clearlwp(struct puffs_usermount *pu)
{
- rump_clear_curlwp();
+ rump_pub_clear_curlwp();
}
static __inline struct p2k_vp_hash *
@@ -189,14 +189,14 @@
hl = gethash(p2m, vp);
if (p2n) {
- rump_vp_rele(vp);
+ rump_pub_vp_rele(vp);
} else {
if (p2n_storage)
p2n = p2n_storage;
else
p2n = malloc(sizeof(*p2n));
if (!p2n) {
- rump_vp_rele(vp);
+ rump_pub_vp_rele(vp);
return NULL;
}
memset(p2n, 0, sizeof(*p2n));
@@ -456,7 +456,7 @@
{
struct mount *mp = ukfs_getmp(puffs_getspecific(pu));
- return rump_vfs_statvfs(mp, sbp);
+ return rump_pub_vfs_statvfs(mp, sbp);
}
/*ARGSUSED*/
@@ -467,16 +467,16 @@
struct p2k_mount *p2m = ukfs_getspecific(fs);
int error = 0;
- rump_clear_curlwp(); /* ukfs does its own curlwp tricks */
+ rump_pub_clear_curlwp(); /* ukfs does its own curlwp tricks */
- rump_vp_rele(p2m->p2m_rvp);
+ rump_pub_vp_rele(p2m->p2m_rvp);
if (ukfs_release(fs, 0) != 0) {
ukfs_release(fs, UKFS_RELFLAG_FORCE);
error = 0;
}
p2m->p2m_ukfs = NULL;
- rump_setup_curlwp(0, 1, 1);
+ rump_pub_setup_curlwp(0, 1, 1);
return error;
}
@@ -489,7 +489,7 @@
int rv;
cred = cred_create(pcr);
- rv = rump_vfs_sync(mp, waitfor, (kauth_cred_t)cred);
+ rv = rump_pub_vfs_sync(mp, waitfor, (kauth_cred_t)cred);
cred_destroy(cred);
return rv;
@@ -509,7 +509,7 @@
uint64_t rdev; /* XXX: allows running this on NetBSD 5.0 */
int rv;
- rv = rump_vfs_fhtovp(mp, fid, &vp);
+ rv = rump_pub_vfs_fhtovp(mp, fid, &vp);
if (rv)
return rv;
RUMP_VOP_UNLOCK(vp, 0);
@@ -519,7 +519,7 @@
return ENOMEM;
puffs_newinfo_setcookie(pni, p2n);
- rump_getvninfo(vp, &vtype, &vsize, (void *)&rdev);
+ rump_pub_getvninfo(vp, &vtype, &vsize, (void *)&rdev);
puffs_newinfo_setvtype(pni, vtype);
puffs_newinfo_setsize(pni, vsize);
/* LINTED: yea, it'll lose accuracy, but that's life */
@@ -535,7 +535,7 @@
{
struct vnode *vp = cookie;
- return rump_vfs_vptofh(vp, fid, fidsize);
+ return rump_pub_vfs_vptofh(vp, fid, fidsize);
}
/*ARGSUSED*/
@@ -556,7 +556,7 @@
RUMP_VOP_LOCK(dvp, LK_EXCLUSIVE);
rv = RUMP_VOP_LOOKUP(dvp, &vp, cn);
RUMP_VOP_UNLOCK(dvp, 0);
- if (rump_checksavecn(cn)) {
+ if (rump_pub_checksavecn(cn)) {
/*
* XXX: detect RENAME by SAVESTART, both src and targ lookups
*
@@ -612,7 +612,7 @@
}
puffs_newinfo_setcookie(pni, p2n);
- rump_getvninfo(vp, &vtype, &vsize, (void *)&rdev);
+ rump_pub_getvninfo(vp, &vtype, &vsize, (void *)&rdev);
puffs_newinfo_setvtype(pni, vtype);
puffs_newinfo_setsize(pni, vsize);
/* LINTED: yea, it'll lose accuracy, but that's life */
@@ -628,14 +628,14 @@
/*LINTED*/
return __NetBSD_Version__ < VERS_TIMECHANGE
- && rump_getversion() >= VERS_TIMECHANGE;
+ && rump_pub_getversion() >= VERS_TIMECHANGE;
}
#define DOCOMPAT(va, va_compat) \
do { \
if (needcompat()) { \
- va_compat = rump_vattr_init(); \
- rump_vattr50_to_vattr(va, va_compat); \
+ va_compat = rump_pub_vattr_init(); \
+ rump_pub_vattr50_to_vattr(va, va_compat); \
} else { \
va_compat = __UNCONST(va); \
} \
@@ -644,7 +644,7 @@
#define UNDOCOMPAT(va_compat) \
do { \
if (needcompat()) \
- rump_vattr_free(va_compat); \
+ rump_pub_vattr_free(va_compat); \
} while (/*CONSTCOND*/0)
static int
@@ -677,7 +677,7 @@
}
RUMP_VOP_LOCK(dvp, LK_EXCLUSIVE);
- rump_vp_incref(dvp);
+ rump_pub_vp_incref(dvp);
if (makefn) {
rv = makefn(dvp, &vp, cn, va_x);
} else {
@@ -788,7 +788,7 @@
return 0;
if (needcompat()) {
- va_x = rump_vattr_init();
+ va_x = rump_pub_vattr_init();
} else {
va_x = vap;
}
@@ -800,8 +800,8 @@
cred_destroy(cred);
if (needcompat()) {
- rump_vattr_to_vattr50(va_x, vap);
- rump_vattr_free(va_x);
+ rump_pub_vattr_to_vattr50(va_x, vap);
+ rump_pub_vattr_free(va_x);
}
return rv;
@@ -906,9 +906,9 @@
}
RUMP_VOP_LOCK(dvp, LK_EXCLUSIVE);
- rump_vp_incref(dvp);
+ rump_pub_vp_incref(dvp);
RUMP_VOP_LOCK(vp, LK_EXCLUSIVE);
- rump_vp_incref(vp);
+ rump_pub_vp_incref(vp);
rv = nukefn(dvp, vp, cn);
assert(RUMP_VOP_ISLOCKED(dvp) == 0);
assert(RUMP_VOP_ISLOCKED(vp) == 0);
@@ -945,7 +945,7 @@
}
RUMP_VOP_LOCK(dvp, LK_EXCLUSIVE);
- rump_vp_incref(dvp);
+ rump_pub_vp_incref(dvp);
rv = RUMP_VOP_LINK(dvp, OPC2VP(targ), cn);
freecn(cn, 0);
@@ -986,13 +986,13 @@
tvp = OPC2VP(targ);
}
- rump_vp_incref(dvp);
- rump_vp_incref(vp);
+ rump_pub_vp_incref(dvp);
+ rump_pub_vp_incref(vp);
RUMP_VOP_LOCK(tdvp, LK_EXCLUSIVE);
- rump_vp_incref(tdvp);
+ rump_pub_vp_incref(tdvp);
if (tvp) {
RUMP_VOP_LOCK(tvp, LK_EXCLUSIVE);
- rump_vp_incref(tvp);
+ rump_pub_vp_incref(tvp);
}
rv = RUMP_VOP_RENAME(dvp, vp, cn_src, tdvp, tvp, cn_targ);
assert(RUMP_VOP_ISLOCKED(tdvp) == 0);
@@ -1050,7 +1050,7 @@
int rv;
cred = cred_create(pcr);
- uio = rump_uio_setup(dent, *reslen, *readoff, RUMPUIO_READ);
+ uio = rump_pub_uio_setup(dent, *reslen, *readoff, RUMPUIO_READ);
RUMP_VOP_LOCK(vp, LK_SHARED);
if (cookies) {
rv = RUMP_VOP_READDIR(vp, uio, cred, eofflag,
@@ -1063,10 +1063,10 @@
}
RUMP_VOP_UNLOCK(vp, 0);
if (rv == 0) {
- *reslen = rump_uio_getresid(uio);
- *readoff = rump_uio_getoff(uio);
+ *reslen = rump_pub_uio_getresid(uio);
+ *readoff = rump_pub_uio_getoff(uio);
}
- rump_uio_free(uio);
+ rump_pub_uio_free(uio);
cred_destroy(cred);
return rv;
@@ -1083,11 +1083,11 @@
int rv;
cred = cred_create(pcr);
- uio = rump_uio_setup(linkname, *linklen, 0, RUMPUIO_READ);
+ uio = rump_pub_uio_setup(linkname, *linklen, 0, RUMPUIO_READ);
RUMP_VOP_LOCK(vp, LK_EXCLUSIVE);
rv = RUMP_VOP_READLINK(vp, uio, cred);
RUMP_VOP_UNLOCK(vp, 0);
- *linklen -= rump_uio_free(uio);
+ *linklen -= rump_pub_uio_free(uio);
cred_destroy(cred);
return rv;
@@ -1105,11 +1105,11 @@
int rv;
cred = cred_create(pcr);
- uio = rump_uio_setup(buf, *resid, offset, RUMPUIO_READ);
+ uio = rump_pub_uio_setup(buf, *resid, offset, RUMPUIO_READ);
RUMP_VOP_LOCK(vp, LK_SHARED);
rv = RUMP_VOP_READ(vp, uio, ioflag, cred);
RUMP_VOP_UNLOCK(vp, 0);
- *resid = rump_uio_free(uio);
+ *resid = rump_pub_uio_free(uio);
cred_destroy(cred);
return rv;
@@ -1131,11 +1131,11 @@
return 0;
cred = cred_create(pcr);
- uio = rump_uio_setup(buf, *resid, offset, RUMPUIO_WRITE);
+ uio = rump_pub_uio_setup(buf, *resid, offset, RUMPUIO_WRITE);
RUMP_VOP_LOCK(vp, LK_EXCLUSIVE);
rv = RUMP_VOP_WRITE(vp, uio, ioflag, cred);
RUMP_VOP_UNLOCK(vp, 0);
- *resid = rump_uio_free(uio);
+ *resid = rump_pub_uio_free(uio);
cred_destroy(cred);
return rv;
@@ -1158,7 +1158,7 @@
* Flush all cached vnode pages from the rump kernel -- they
* are kept in puffs for all things that matter.
*/
- rump_vp_interlock(vp);
+ rump_pub_vp_interlock(vp);
(void) RUMP_VOP_PUTPAGES(vp, 0, 0, PGO_ALLPAGES|PGO_CLEANIT|PGO_FREE);
/*
@@ -1177,7 +1177,7 @@
rv = RUMP_VOP_INACTIVE(vp, &recycle);
if (recycle) {
puffs_setback(puffs_cc_getcc(pu), PUFFS_SETBACK_NOREF_N1);
- rump_vp_rele(p2n->p2n_vp);
+ rump_pub_vp_rele(p2n->p2n_vp);
p2n->p2n_vp = NULL;
}
@@ -1191,7 +1191,7 @@
struct p2k_node *p2n = opc;
if (p2n->p2n_vp) {
- rump_vp_rele(p2n->p2n_vp);
+ rump_pub_vp_rele(p2n->p2n_vp);
p2n->p2n_vp = NULL;
}
Index: src/lib/libukfs/ukfs.c
diff -u src/lib/libukfs/ukfs.c:1.39 src/lib/libukfs/ukfs.c:1.40
--- src/lib/libukfs/ukfs.c:1.39 Wed Oct 7 20:53:38 2009
+++ src/lib/libukfs/ukfs.c Wed Oct 14 18:22:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: ukfs.c,v 1.39 2009/10/07 20:53:38 pooka Exp $ */
+/* $NetBSD: ukfs.c,v 1.40 2009/10/14 18:22:50 pooka Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Antti Kantee. All Rights Reserved.
@@ -96,7 +96,7 @@
struct vnode *rvp;
rvp = ukfs->ukfs_rvp;
- rump_vp_incref(rvp);
+ rump_pub_vp_incref(rvp);
return rvp;
}
@@ -141,13 +141,13 @@
{
struct vnode *rvp, *cvp;
- rump_setup_curlwp(nextpid(ukfs), 1, 1);
+ rump_pub_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);
+ rump_pub_rcvp_set(rvp, cvp); /* takes refs */
+ rump_pub_vp_rele(rvp);
}
static void
@@ -156,9 +156,9 @@
struct vnode *rvp;
rvp = ukfs_getrvp(ukfs);
- rump_rcvp_set(NULL, rvp);
- rump_vp_rele(rvp);
- rump_clear_curlwp();
+ rump_pub_rcvp_set(NULL, rvp);
+ rump_pub_vp_rele(rvp);
+ rump_pub_clear_curlwp();
}
int
@@ -352,7 +352,7 @@
}
if (partition != UKFS_PARTITION_NA) {
- rv = rump_etfs_register_withsize(devpath, devpath,
+ rv = rump_pub_etfs_register_withsize(devpath, devpath,
RUMP_ETFS_BLK, devoff, devsize);
if (rv) {
goto out;
@@ -366,11 +366,11 @@
goto out;
}
mounted = 1;
- rv = rump_vfs_getmp(mountpath, &fs->ukfs_mp);
+ rv = rump_pub_vfs_getmp(mountpath, &fs->ukfs_mp);
if (rv) {
goto out;
}
- rv = rump_vfs_root(fs->ukfs_mp, &fs->ukfs_rvp, 0);
+ rv = rump_pub_vfs_root(fs->ukfs_mp, &fs->ukfs_rvp, 0);
if (rv) {
goto out;
}
@@ -388,14 +388,14 @@
if (rv) {
if (fs) {
if (fs->ukfs_rvp)
- rump_vp_rele(fs->ukfs_rvp);
+ rump_pub_vp_rele(fs->ukfs_rvp);
free(fs);
fs = NULL;
}
if (mounted)
rump_sys_unmount(mountpath, MNT_FORCE);
if (regged)
- rump_etfs_remove(devpath);
+ rump_pub_etfs_remove(devpath);
if (devfd != -1) {
flock(devfd, LOCK_UN);
close(devfd);
@@ -435,23 +435,23 @@
mntflag = 0;
if (flags & UKFS_RELFLAG_FORCE)
mntflag = MNT_FORCE;
- rump_setup_curlwp(nextpid(fs), 1, 1);
- rump_vp_rele(fs->ukfs_rvp);
+ rump_pub_setup_curlwp(nextpid(fs), 1, 1);
+ rump_pub_vp_rele(fs->ukfs_rvp);
fs->ukfs_rvp = NULL;
rv = rump_sys_unmount(fs->ukfs_mountpath, mntflag);
if (rv == -1) {
error = errno;
- rump_vfs_root(fs->ukfs_mp, &fs->ukfs_rvp, 0);
- rump_clear_curlwp();
+ rump_pub_vfs_root(fs->ukfs_mp, &fs->ukfs_rvp, 0);
+ rump_pub_clear_curlwp();
ukfs_chdir(fs, fs->ukfs_mountpath);
errno = error;
return -1;
}
- rump_clear_curlwp();
+ rump_pub_clear_curlwp();
}
if (fs->ukfs_devpath) {
- rump_etfs_remove(fs->ukfs_devpath);
+ rump_pub_etfs_remove(fs->ukfs_devpath);
free(fs->ukfs_devpath);
}
free(fs->ukfs_mountpath);
@@ -481,7 +481,7 @@
int rv;
precall(ukfs);
- rv = rump_namei(RUMP_NAMEI_LOOKUP, RUMP_NAMEI_LOCKLEAF, dirname,
+ rv = rump_pub_namei(RUMP_NAMEI_LOOKUP, RUMP_NAMEI_LOCKLEAF, dirname,
NULL, &vp, NULL);
postcall(ukfs);
@@ -505,13 +505,13 @@
int rv, eofflag;
kauth_cred_t cred;
- uio = rump_uio_setup(buf, bufsize, *off, RUMPUIO_READ);
- cred = rump_cred_suserget();
+ uio = rump_pub_uio_setup(buf, bufsize, *off, RUMPUIO_READ);
+ cred = rump_pub_cred_suserget();
rv = RUMP_VOP_READDIR(vp, uio, cred, &eofflag, NULL, NULL);
- rump_cred_suserput(cred);
+ rump_pub_cred_put(cred);
RUMP_VOP_UNLOCK(vp, 0);
- *off = rump_uio_getoff(uio);
- resid = rump_uio_free(uio);
+ *off = rump_pub_uio_getoff(uio);
+ resid = rump_pub_uio_free(uio);
if (rv) {
errno = rv;
@@ -542,7 +542,7 @@
int rv;
precall(ukfs);
- rv = rump_namei(RUMP_NAMEI_LOOKUP, RUMP_NAMEI_LOCKLEAF, dirname,
+ rv = rump_pub_namei(RUMP_NAMEI_LOOKUP, RUMP_NAMEI_LOCKLEAF, dirname,
NULL, &vp, NULL);
postcall(ukfs);
if (rv) {
@@ -551,7 +551,7 @@
}
rv = getmydents(vp, off, buf, bufsize);
- rump_vp_rele(vp);
+ rump_pub_vp_rele(vp);
return rv;
}
@@ -561,7 +561,7 @@
{
/*LINTED*/
- rump_vp_rele((struct vnode *)c);
+ rump_pub_vp_rele((struct vnode *)c);
return 0;
}
@@ -754,13 +754,13 @@
if (rv == -1)
goto out;
- newvp = rump_cdir_get();
+ newvp = rump_pub_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);
+ rump_pub_vp_rele(oldvp);
out:
postcall(ukfs);
@@ -785,7 +785,7 @@
#ifdef __NetBSD__
/*LINTED*/
return __NetBSD_Version__ < VERS_TIMECHANGE
- && rump_getversion() >= VERS_TIMECHANGE;
+ && rump_pub_getversion() >= VERS_TIMECHANGE;
#else
return 0;
#endif
@@ -798,7 +798,7 @@
precall(ukfs);
if (needcompat())
- rv = rump_sys___stat30(filename, file_stat);
+ rv = rump_pub_sys___stat30(filename, file_stat);
else
rv = rump_sys_stat(filename, file_stat);
postcall(ukfs);
@@ -813,7 +813,7 @@
precall(ukfs);
if (needcompat())
- rv = rump_sys___lstat30(filename, file_stat);
+ rv = rump_pub_sys___lstat30(filename, file_stat);
else
rv = rump_sys_lstat(filename, file_stat);
postcall(ukfs);
@@ -908,7 +908,7 @@
mi = dlsym(handle, "__start_link_set_modules");
if (mi) {
- error = rump_module_init(*mi, NULL);
+ error = rump_pub_module_init(*mi, NULL);
if (error)
goto errclose;
return 1;
Index: src/tests/fs/ffs/t_renamerace.c
diff -u src/tests/fs/ffs/t_renamerace.c:1.8 src/tests/fs/ffs/t_renamerace.c:1.9
--- src/tests/fs/ffs/t_renamerace.c:1.8 Thu Sep 17 13:12:51 2009
+++ src/tests/fs/ffs/t_renamerace.c Wed Oct 14 18:22:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: t_renamerace.c,v 1.8 2009/09/17 13:12:51 pooka Exp $ */
+/* $NetBSD: t_renamerace.c,v 1.9 2009/10/14 18:22:50 pooka Exp $ */
/*
* Modified for rump and atf from a program supplied
@@ -92,7 +92,7 @@
rump_init();
if (rump_sys_mkdir("/mp", 0777) == -1)
atf_tc_fail_errno("cannot create mountpoint");
- rump_etfs_register(FAKEBLK, image, RUMP_ETFS_BLK);
+ rump_pub_etfs_register(FAKEBLK, image, RUMP_ETFS_BLK);
if (rump_sys_mount(MOUNT_FFS, "/mp", MNT_LOG, &args, sizeof(args))==-1)
atf_tc_fail_errno("rump_sys_mount failed");
Index: src/tests/syscall/t_cmsg.c
diff -u src/tests/syscall/t_cmsg.c:1.7 src/tests/syscall/t_cmsg.c:1.8
--- src/tests/syscall/t_cmsg.c:1.7 Fri May 15 15:54:03 2009
+++ src/tests/syscall/t_cmsg.c Wed Oct 14 18:22:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: t_cmsg.c,v 1.7 2009/05/15 15:54:03 pooka Exp $ */
+/* $NetBSD: t_cmsg.c,v 1.8 2009/10/14 18:22:50 pooka Exp $ */
#include <sys/types.h>
#include <sys/mount.h>
@@ -118,10 +118,10 @@
atf_tc_fail_errno("socket 1 listen");
/* store our current lwp/proc */
- l1 = rump_get_curlwp();
+ l1 = rump_pub_get_curlwp();
/* create new process */
- l2 = rump_newproc_switch();
+ l2 = rump_pub_newproc_switch();
/* connect to unix domain socket */
memset(&sun, 0, sizeof(sun));
Index: src/usr.sbin/puffs/rump_lfs/rump_lfs.c
diff -u src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.8 src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.9
--- src/usr.sbin/puffs/rump_lfs/rump_lfs.c:1.8 Fri Oct 9 16:38:21 2009
+++ src/usr.sbin/puffs/rump_lfs/rump_lfs.c Wed Oct 14 18:22:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_lfs.c,v 1.8 2009/10/09 16:38:21 pooka Exp $ */
+/* $NetBSD: rump_lfs.c,v 1.9 2009/10/14 18:22:50 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -90,7 +90,7 @@
* obviously FIXXXME along with the cleaner.
*/
sprintf(rawdev, "/dev/r%s", canon_dev+5);
- rump_etfs_register(rawdev, canon_dev, RUMP_ETFS_CHR);
+ rump_pub_etfs_register(rawdev, canon_dev, RUMP_ETFS_CHR);
/*
* We basically have two choices:
