Module Name: src
Committed By: pooka
Date: Tue Sep 7 17:13:04 UTC 2010
Modified Files:
src/sys/rump/librump/rumpvfs: rump_vfs.c rumpvfs.ifspec
Log Message:
Retire the prehistoric chroot/cwd interfaces now that there is a
process model in rump.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/rump/librump/rumpvfs/rump_vfs.c
cvs rdiff -u -r1.5 -r1.6 src/sys/rump/librump/rumpvfs/rumpvfs.ifspec
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpvfs/rump_vfs.c
diff -u src/sys/rump/librump/rumpvfs/rump_vfs.c:1.56 src/sys/rump/librump/rumpvfs/rump_vfs.c:1.57
--- src/sys/rump/librump/rumpvfs/rump_vfs.c:1.56 Wed Jun 30 15:48:59 2010
+++ src/sys/rump/librump/rumpvfs/rump_vfs.c Tue Sep 7 17:13:03 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_vfs.c,v 1.56 2010/06/30 15:48:59 pooka Exp $ */
+/* $NetBSD: rump_vfs.c,v 1.57 2010/09/07 17:13:03 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.56 2010/06/30 15:48:59 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_vfs.c,v 1.57 2010/09/07 17:13:03 pooka Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -59,8 +59,6 @@
struct cwdinfo cwdi0;
const char *rootfstype = ROOT_FSTYPE_ANY;
-static void rump_rcvp_lwpset(struct vnode *, struct vnode *, struct lwp *);
-
static void
pvfs_init(struct proc *p)
{
@@ -484,44 +482,3 @@
biodone(bp);
}
-
-static void
-rump_rcvp_lwpset(struct vnode *rvp, struct vnode *cvp, struct lwp *l)
-{
- struct cwdinfo *cwdi = l->l_proc->p_cwdi;
-
- KASSERT(cvp);
-
- rw_enter(&cwdi->cwdi_lock, RW_WRITER);
- if (cwdi->cwdi_rdir)
- vrele(cwdi->cwdi_rdir);
- if (rvp)
- vref(rvp);
- cwdi->cwdi_rdir = rvp;
-
- vrele(cwdi->cwdi_cdir);
- vref(cvp);
- cwdi->cwdi_cdir = cvp;
- rw_exit(&cwdi->cwdi_lock);
-}
-
-void
-rump_rcvp_set(struct vnode *rvp, struct vnode *cvp)
-{
-
- rump_rcvp_lwpset(rvp, cvp, curlwp);
-}
-
-struct vnode *
-rump_cdir_get(void)
-{
- struct vnode *vp;
- struct cwdinfo *cwdi = curlwp->l_proc->p_cwdi;
-
- rw_enter(&cwdi->cwdi_lock, RW_READER);
- vp = cwdi->cwdi_cdir;
- rw_exit(&cwdi->cwdi_lock);
- vref(vp);
-
- return vp;
-}
Index: src/sys/rump/librump/rumpvfs/rumpvfs.ifspec
diff -u src/sys/rump/librump/rumpvfs/rumpvfs.ifspec:1.5 src/sys/rump/librump/rumpvfs/rumpvfs.ifspec:1.6
--- src/sys/rump/librump/rumpvfs/rumpvfs.ifspec:1.5 Mon Jul 19 15:29:44 2010
+++ src/sys/rump/librump/rumpvfs/rumpvfs.ifspec Tue Sep 7 17:13:03 2010
@@ -1,4 +1,4 @@
-; $NetBSD: rumpvfs.ifspec,v 1.5 2010/07/19 15:29:44 pooka Exp $
+; $NetBSD: rumpvfs.ifspec,v 1.6 2010/09/07 17:13:03 pooka Exp $
NAME|vfs
PUBHDR|include/rump/rumpvfs_if_pub.h
@@ -10,7 +10,6 @@
void |getvninfo |struct vnode *, enum vtype *, off_t *, dev_t *
-
struct vfsops * |vfslist_iterate|struct vfsops *
struct vfsops * |vfs_getopsbyname|const char *
@@ -53,9 +52,6 @@
void |vfs_mount_print|const char *, int
-void |rcvp_set |struct vnode *, struct vnode *
-struct vnode * |cdir_get |void
-
; I picked the wrong header to stop sniffin' glue
int |syspuffs_glueinit |int, int * |WEAK