KSE Milestone 2

Note ALL MODULES MUST BE RECOMPILED
make the kernel aware that there are smaller units of scheduling than the
process. (but only allow one thread per process at this time).
This is functionally equivalent to teh previousl -current except
that there is a thread associated with each process.

Sorry john! (your next MFC will be a doosie!)

Reviewed by: peter@freebsd.org, dillon@freebsd.org

X-MFC after:    ha ha ha ha

4 files changed, 13 insertions, 13 deletions

diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c
index e74c683..45117ac 100644
--- a/sys/fs/pseudofs/pseudofs.c
+++ b/sys/fs/pseudofs/pseudofs.c
@@ -51,7 +51,7 @@ SYSCTL_NODE(_vfs, OID_AUTO, pfs, CTLFLAG_RW, 0,
  */
 int
 pfs_mount(struct pfs_info *pi, struct mount *mp, char *path, caddr_t data,
-	  struct nameidata *ndp, struct proc *p)
+	  struct nameidata *ndp, struct thread *td)
 {
 	struct statfs *sbp;
   
@@ -79,7 +79,7 @@ pfs_mount(struct pfs_info *pi, struct mount *mp, char *path, caddr_t data,
  * Unmount a pseudofs instance
  */
 int
-pfs_unmount(struct mount *mp, int mntflags, struct proc *p)
+pfs_unmount(struct mount *mp, int mntflags, struct thread *td)
 {
 	struct pfs_info *pi;
 	int error;
@@ -108,7 +108,7 @@ pfs_root(struct mount *mp, struct vnode **vpp)
  * Return filesystem stats
  */
 int
-pfs_statfs(struct mount *mp, struct statfs *sbp, struct proc *p)
+pfs_statfs(struct mount *mp, struct statfs *sbp, struct thread *td)
 {
 	bcopy(&mp->mnt_stat, sbp, sizeof *sbp);
 	return (0);
diff --git a/sys/fs/pseudofs/pseudofs.h b/sys/fs/pseudofs/pseudofs.h
index cfe3d9e..474f442 100644
--- a/sys/fs/pseudofs/pseudofs.h
+++ b/sys/fs/pseudofs/pseudofs.h
@@ -56,7 +56,7 @@ struct pfs_node;
 struct pfs_bitmap;
 
 #define PFS_FILL_ARGS \
-	struct proc *curp, struct proc *p, struct pfs_node *pn, struct sbuf *sb
+	struct thread *td, struct proc *p, struct pfs_node *pn, struct sbuf *sb
 #define PFS_FILL_PROTO(name) \
 	int name(PFS_FILL_ARGS);
 typedef int (*pfs_fill_t)(PFS_FILL_ARGS);
@@ -122,12 +122,12 @@ struct pfs_node {
  */
 int	 pfs_mount		(struct pfs_info *pi,
 				 struct mount *mp, char *path, caddr_t data,
-				 struct nameidata *ndp, struct proc *p);
+				 struct nameidata *ndp, struct thread *td);
 int	 pfs_unmount		(struct mount *mp, int mntflags,
-				 struct proc *p);
+				 struct thread *td);
 int	 pfs_root		(struct mount *mp, struct vnode **vpp);
 int	 pfs_statfs		(struct mount *mp, struct statfs *sbp,
-				 struct proc *p);
+				 struct thread *td);
 int	 pfs_init		(struct pfs_info *pi, struct vfsconf *vfc);
 int	 pfs_uninit		(struct pfs_info *pi, struct vfsconf *vfc);
 
@@ -143,8 +143,8 @@ static struct pfs_info name##_info = {					\
 									\
 static int								\
 _##name##_mount(struct mount *mp, char *path, caddr_t data,		\
-	     struct nameidata *ndp, struct proc *p) {			\
-        return pfs_mount(&name##_info, mp, path, data, ndp, p);		\
+	     struct nameidata *ndp, struct thread *td) {		\
+        return pfs_mount(&name##_info, mp, path, data, ndp, td);		\
 }									\
 									\
 static int								\
diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c
index 465bfcd..3ff33d7 100644
--- a/sys/fs/pseudofs/pseudofs_vncache.c
+++ b/sys/fs/pseudofs/pseudofs_vncache.c
@@ -98,7 +98,7 @@ pfs_vncache_alloc(struct mount *mp, struct vnode **vpp,
 	for (pv = pfs_vncache; pv; pv = pv->pv_next) {
 		pvd = (struct pfs_vdata *)pv->pv_vnode->v_data;
 		if (pvd->pvd_pn == pn && pvd->pvd_pid == pid) {
-			if (vget(pv->pv_vnode, 0, curproc) == 0) {
+			if (vget(pv->pv_vnode, 0, curthread) == 0) {
 				++pfs_vncache_hits;
 				*vpp = pv->pv_vnode;
 				mtx_unlock(&pfs_vncache_mutex);
diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c
index ea26435..db62cbd 100644
--- a/sys/fs/pseudofs/pseudofs_vnops.c
+++ b/sys/fs/pseudofs/pseudofs_vnops.c
@@ -56,7 +56,7 @@ pfs_access(struct vop_access_args *va)
 	struct vattr vattr;
 	int error;
 	
-	error = VOP_GETATTR(vn, &vattr, va->a_cred, va->a_p);
+	error = VOP_GETATTR(vn, &vattr, va->a_cred, va->a_td);
 	if (error)
 		return (error);
 	error = vaccess(vn->v_type, vattr.va_mode, vattr.va_uid,
@@ -230,7 +230,7 @@ pfs_read(struct vop_read_args *va)
 		return (EIO);
 	}
 
-	error = (pn->pn_func)(curproc, proc, pn, sb);
+	error = (pn->pn_func)(curthread, proc, pn, sb);
 
 	if (proc != NULL)
 		PRELE(proc);
@@ -392,7 +392,7 @@ pfs_readlink(struct vop_readlink_args *va)
 	/* sbuf_new() can't fail with a static buffer */
 	sbuf_new(&sb, buf, sizeof buf, 0);
 
-	error = (pn->pn_func)(curproc, proc, pn, &sb);
+	error = (pn->pn_func)(curthread, proc, pn, &sb);
 
 	if (proc != NULL)
 		PRELE(proc);