Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use newstyle rump lwp interfaces

This commit is contained in:
pooka 2009-10-15 16:41:08 +00:00
parent c663ed2f3f
commit 2ce66cd910
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libp2k/p2k.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: p2k.c,v 1.23 2009/10/14 18:22:50 pooka Exp $ */
/* $NetBSD: p2k.c,v 1.24 2009/10/15 16:41:08 pooka Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Antti Kantee. All Rights Reserved.
@ -126,7 +126,7 @@ makecn(const struct puffs_cn *pcn, int myflags)
cred = cred_create(pcn->pcn_cred);
/* LINTED: prehistoric types in first two args */
return rump_pub_makecn(pcn->pcn_nameiop, pcn->pcn_flags | myflags,
pcn->pcn_name, pcn->pcn_namelen, cred, rump_pub_get_curlwp());
pcn->pcn_name, pcn->pcn_namelen, cred, rump_pub_lwp_curlwp());
}
static __inline void
@ -143,7 +143,7 @@ makelwp(struct puffs_usermount *pu)
lwpid_t lid;
puffs_cc_getcaller(puffs_cc_getcc(pu), &pid, &lid);
rump_pub_setup_curlwp(pid, lid, 1);
rump_pub_lwp_alloc_and_switch(pid, lid);
}
/*ARGSUSED*/
@ -151,7 +151,7 @@ static void
clearlwp(struct puffs_usermount *pu)
{
rump_pub_clear_curlwp();
rump_pub_lwp_release(rump_pub_lwp_curlwp());
}
static __inline struct p2k_vp_hash *
@ -467,7 +467,7 @@ p2k_fs_unmount(struct puffs_usermount *pu, int flags)
struct p2k_mount *p2m = ukfs_getspecific(fs);
int error = 0;
rump_pub_clear_curlwp(); /* ukfs does its own curlwp tricks */
rump_pub_lwp_release(rump_pub_lwp_curlwp()); /* ukfs & curlwp tricks */
rump_pub_vp_rele(p2m->p2m_rvp);
if (ukfs_release(fs, 0) != 0) {
@ -476,7 +476,7 @@ p2k_fs_unmount(struct puffs_usermount *pu, int flags)
}
p2m->p2m_ukfs = NULL;
rump_pub_setup_curlwp(0, 1, 1);
rump_pub_lwp_alloc_and_switch(0, 0);
return error;
}

12
lib/libukfs/ukfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ukfs.c,v 1.40 2009/10/14 18:22:50 pooka Exp $ */
/* $NetBSD: ukfs.c,v 1.41 2009/10/15 16:41:08 pooka Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Antti Kantee. All Rights Reserved.
@ -141,7 +141,7 @@ precall(struct ukfs *ukfs)
{
struct vnode *rvp, *cvp;
rump_pub_setup_curlwp(nextpid(ukfs), 1, 1);
rump_pub_lwp_alloc_and_switch(nextpid(ukfs), 1);
rvp = ukfs_getrvp(ukfs);
pthread_spin_lock(&ukfs->ukfs_spin);
cvp = ukfs->ukfs_cdir;
@ -158,7 +158,7 @@ postcall(struct ukfs *ukfs)
rvp = ukfs_getrvp(ukfs);
rump_pub_rcvp_set(NULL, rvp);
rump_pub_vp_rele(rvp);
rump_pub_clear_curlwp();
rump_pub_lwp_release(rump_pub_lwp_curlwp());
}
int
@ -435,19 +435,19 @@ ukfs_release(struct ukfs *fs, int flags)
mntflag = 0;
if (flags & UKFS_RELFLAG_FORCE)
mntflag = MNT_FORCE;
rump_pub_setup_curlwp(nextpid(fs), 1, 1);
rump_pub_lwp_alloc_and_switch(nextpid(fs), 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_pub_vfs_root(fs->ukfs_mp, &fs->ukfs_rvp, 0);
rump_pub_clear_curlwp();
rump_pub_lwp_release(rump_pub_lwp_curlwp());
ukfs_chdir(fs, fs->ukfs_mountpath);
errno = error;
return -1;
}
rump_pub_clear_curlwp();
rump_pub_lwp_release(rump_pub_lwp_curlwp());
}
if (fs->ukfs_devpath) {