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, 33 insertions, 30 deletions

diff --git a/sys/netatalk/at_control.c b/sys/netatalk/at_control.c
index 31072258501f..514411599d97 100644
--- a/sys/netatalk/at_control.c
+++ b/sys/netatalk/at_control.c
@@ -43,7 +43,7 @@ static int aa_claim_addr(struct ifaddr *ifa, struct sockaddr *gw);
 
 int
 at_control(struct socket *so, u_long cmd, caddr_t data,
-		struct ifnet *ifp, struct proc *p )
+		struct ifnet *ifp, struct thread *td )
 {
     struct ifreq	*ifr = (struct ifreq *)data;
     struct sockaddr_at	*sat;
@@ -99,7 +99,7 @@ at_control(struct socket *so, u_long cmd, caddr_t data,
 	/* 
 	 * If we are not superuser, then we don't get to do these ops.
 	 */
-	if ( suser(p) ) {
+	if ( suser_td(td) ) {
 	    return( EPERM );
 	}
 
diff --git a/sys/netatalk/at_extern.h b/sys/netatalk/at_extern.h
index 8191d4f8a806..583bbec134b5 100644
--- a/sys/netatalk/at_extern.h
+++ b/sys/netatalk/at_extern.h
@@ -1,3 +1,6 @@
+/*
+ * $FreeBSD$
+ */
 struct mbuf;
 struct sockaddr_at;
 
@@ -16,7 +19,7 @@ extern void	aarptfree	__P((struct aarptab *));
 #endif
 
 struct ifnet;
-struct proc;
+struct thread;
 struct socket;
 
 extern void	aarp_clean	__P((void));
@@ -24,7 +27,7 @@ extern int	at_control	__P(( struct socket *so,
 					u_long cmd,
 					caddr_t data,
 					struct ifnet *ifp,
-					struct proc *p ));
+					struct thread *td ));
 extern u_short	at_cksum	__P(( struct mbuf *m, int skip));
 extern void	ddp_init	__P((void ));
 extern struct at_ifaddr *at_ifawithnet	__P((struct sockaddr_at *));
diff --git a/sys/netatalk/ddp_pcb.c b/sys/netatalk/ddp_pcb.c
index 7390d8df95bb..2dbf0f9c1609 100644
--- a/sys/netatalk/ddp_pcb.c
+++ b/sys/netatalk/ddp_pcb.c
@@ -23,9 +23,9 @@
 static void at_pcbdisconnect( struct ddpcb *ddp );
 static void at_sockaddr(struct ddpcb *ddp, struct sockaddr **addr);
 static int at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr,
-			  struct proc *p);
+			  struct thread *td);
 static int at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, 
-			 struct proc *p);
+			 struct thread *td);
 static void at_pcbdetach(struct socket *so, struct ddpcb *ddp);
 static int at_pcballoc(struct socket *so);
 
@@ -36,7 +36,7 @@ static u_long	ddp_recvspace = 10 * ( 587 + sizeof( struct sockaddr_at ));
 
 
 static int
-ddp_attach(struct socket *so, int proto, struct proc *p)
+ddp_attach(struct socket *so, int proto, struct thread *td)
 {
 	struct ddpcb	*ddp;
 	int		error = 0;
@@ -74,7 +74,7 @@ ddp_detach(struct socket *so)
 }
 
 static int      
-ddp_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
+ddp_bind(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	struct ddpcb	*ddp;
 	int		error = 0;
@@ -85,13 +85,13 @@ ddp_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
 	    return( EINVAL);
 	}
 	s = splnet();
-	error = at_pcbsetaddr(ddp, nam, p);
+	error = at_pcbsetaddr(ddp, nam, td);
 	splx(s);
 	return (error);
 }
     
 static int
-ddp_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
+ddp_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	struct ddpcb	*ddp;
 	int		error = 0;
@@ -107,7 +107,7 @@ ddp_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
 	}
 
 	s = splnet();
-	error = at_pcbconnect( ddp, nam, p );
+	error = at_pcbconnect( ddp, nam, td );
 	splx(s);
 	if ( error == 0 )
 	    soisconnected( so );
@@ -152,7 +152,7 @@ ddp_shutdown(struct socket *so)
 
 static int
 ddp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
-            struct mbuf *control, struct proc *p)
+            struct mbuf *control, struct thread *td)
 {
 	struct ddpcb	*ddp;
 	int		error = 0;
@@ -173,7 +173,7 @@ ddp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
 		}
 
 		s = splnet();
-		error = at_pcbconnect(ddp, addr, p);
+		error = at_pcbconnect(ddp, addr, td);
 		splx( s );
 		if ( error ) {
 			return(error);
@@ -218,7 +218,7 @@ at_sockaddr(struct ddpcb *ddp, struct sockaddr **addr)
 }
 
 static int 
-at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr, struct proc *p)
+at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
 {
     struct sockaddr_at	lsat, *sat;
     struct at_ifaddr	*aa;
@@ -253,7 +253,7 @@ at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr, struct proc *p)
 		return( EINVAL );
 	    }
 	    if ( sat->sat_port < ATPORT_RESERVED &&
-		 suser(p) ) {
+		 suser_td(td) ) {
 		return( EACCES );
 	    }
 	}
@@ -312,7 +312,7 @@ at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr, struct proc *p)
 }
 
 static int
-at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, struct proc *p)
+at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
 {
     struct sockaddr_at	*sat = (struct sockaddr_at *)addr;
     struct route	*ro;
@@ -401,7 +401,7 @@ at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, struct proc *p)
 
     ddp->ddp_fsat = *sat;
     if ( ddp->ddp_lsat.sat_port == ATADDR_ANYPORT ) {
-	return(at_pcbsetaddr(ddp, (struct sockaddr *)0, p));
+	return(at_pcbsetaddr(ddp, (struct sockaddr *)0, td));
     }
     return( 0 );
 }
diff --git a/sys/netatalk/ddp_usrreq.c b/sys/netatalk/ddp_usrreq.c
index 7390d8df95bb..2dbf0f9c1609 100644
--- a/sys/netatalk/ddp_usrreq.c
+++ b/sys/netatalk/ddp_usrreq.c
@@ -23,9 +23,9 @@
 static void at_pcbdisconnect( struct ddpcb *ddp );
 static void at_sockaddr(struct ddpcb *ddp, struct sockaddr **addr);
 static int at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr,
-			  struct proc *p);
+			  struct thread *td);
 static int at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, 
-			 struct proc *p);
+			 struct thread *td);
 static void at_pcbdetach(struct socket *so, struct ddpcb *ddp);
 static int at_pcballoc(struct socket *so);
 
@@ -36,7 +36,7 @@ static u_long	ddp_recvspace = 10 * ( 587 + sizeof( struct sockaddr_at ));
 
 
 static int
-ddp_attach(struct socket *so, int proto, struct proc *p)
+ddp_attach(struct socket *so, int proto, struct thread *td)
 {
 	struct ddpcb	*ddp;
 	int		error = 0;
@@ -74,7 +74,7 @@ ddp_detach(struct socket *so)
 }
 
 static int      
-ddp_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
+ddp_bind(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	struct ddpcb	*ddp;
 	int		error = 0;
@@ -85,13 +85,13 @@ ddp_bind(struct socket *so, struct sockaddr *nam, struct proc *p)
 	    return( EINVAL);
 	}
 	s = splnet();
-	error = at_pcbsetaddr(ddp, nam, p);
+	error = at_pcbsetaddr(ddp, nam, td);
 	splx(s);
 	return (error);
 }
     
 static int
-ddp_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
+ddp_connect(struct socket *so, struct sockaddr *nam, struct thread *td)
 {
 	struct ddpcb	*ddp;
 	int		error = 0;
@@ -107,7 +107,7 @@ ddp_connect(struct socket *so, struct sockaddr *nam, struct proc *p)
 	}
 
 	s = splnet();
-	error = at_pcbconnect( ddp, nam, p );
+	error = at_pcbconnect( ddp, nam, td );
 	splx(s);
 	if ( error == 0 )
 	    soisconnected( so );
@@ -152,7 +152,7 @@ ddp_shutdown(struct socket *so)
 
 static int
 ddp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
-            struct mbuf *control, struct proc *p)
+            struct mbuf *control, struct thread *td)
 {
 	struct ddpcb	*ddp;
 	int		error = 0;
@@ -173,7 +173,7 @@ ddp_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *addr,
 		}
 
 		s = splnet();
-		error = at_pcbconnect(ddp, addr, p);
+		error = at_pcbconnect(ddp, addr, td);
 		splx( s );
 		if ( error ) {
 			return(error);
@@ -218,7 +218,7 @@ at_sockaddr(struct ddpcb *ddp, struct sockaddr **addr)
 }
 
 static int 
-at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr, struct proc *p)
+at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
 {
     struct sockaddr_at	lsat, *sat;
     struct at_ifaddr	*aa;
@@ -253,7 +253,7 @@ at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr, struct proc *p)
 		return( EINVAL );
 	    }
 	    if ( sat->sat_port < ATPORT_RESERVED &&
-		 suser(p) ) {
+		 suser_td(td) ) {
 		return( EACCES );
 	    }
 	}
@@ -312,7 +312,7 @@ at_pcbsetaddr(struct ddpcb *ddp, struct sockaddr *addr, struct proc *p)
 }
 
 static int
-at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, struct proc *p)
+at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, struct thread *td)
 {
     struct sockaddr_at	*sat = (struct sockaddr_at *)addr;
     struct route	*ro;
@@ -401,7 +401,7 @@ at_pcbconnect(struct ddpcb *ddp, struct sockaddr *addr, struct proc *p)
 
     ddp->ddp_fsat = *sat;
     if ( ddp->ddp_lsat.sat_port == ATADDR_ANYPORT ) {
-	return(at_pcbsetaddr(ddp, (struct sockaddr *)0, p));
+	return(at_pcbsetaddr(ddp, (struct sockaddr *)0, td));
     }
     return( 0 );
 }