Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Adjust names of external rump control interfaces to match the
details: https://anonhg.NetBSD.org/src/rev/090e5a9779b1
branches: trunk
changeset: 748133:090e5a9779b1
user: pooka <pooka%NetBSD.org@localhost>
date: Wed Oct 14 18:22:50 2009 +0000
description:
Adjust names of external rump control interfaces to match the
new rump_pub namespace.
diffstat:
lib/libp2k/p2k.c | 96 +++++++++++++++++++-------------------
lib/libukfs/ukfs.c | 68 +++++++++++++-------------
tests/fs/ffs/t_renamerace.c | 4 +-
tests/syscall/t_cmsg.c | 6 +-
usr.sbin/puffs/rump_lfs/rump_lfs.c | 4 +-
5 files changed, 89 insertions(+), 89 deletions(-)
diffs (truncated from 633 to 300 lines):
diff -r 50d91e70c571 -r 090e5a9779b1 lib/libp2k/p2k.c
--- a/lib/libp2k/p2k.c Wed Oct 14 18:22:04 2009 +0000
+++ b/lib/libp2k/p2k.c Wed Oct 14 18:22:50 2009 +0000
@@ -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);
Home |
Main Index |
Thread Index |
Old Index