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

2 files changed, 19 insertions, 19 deletions

diff --git a/sys/netncp/ncp_conn.h b/sys/netncp/ncp_conn.h
index 707cac0..a163eed 100644
--- a/sys/netncp/ncp_conn.h
+++ b/sys/netncp/ncp_conn.h
@@ -195,33 +195,33 @@ struct ncp_conn {
 int  ncp_conn_init(void);
 int  ncp_conn_destroy(void);
 int  ncp_conn_alloc(struct ncp_conn_args *cap,
-	struct proc *p, struct ucred *cred, struct ncp_conn **connid);
+	struct thread *td, struct ucred *cred, struct ncp_conn **connid);
 int  ncp_conn_free(struct ncp_conn *conn);
 int  ncp_conn_access(struct ncp_conn *conn,struct ucred *cred,mode_t mode);
-int  ncp_conn_lock(struct ncp_conn *conn,struct proc *p,struct ucred *cred,int mode);
-void ncp_conn_unlock(struct ncp_conn *conn,struct proc *p);
-int  ncp_conn_assert_locked(struct ncp_conn *conn,char *checker,struct proc *p);
+int  ncp_conn_lock(struct ncp_conn *conn,struct thread *td, struct ucred *cred,int mode);
+void ncp_conn_unlock(struct ncp_conn *conn,struct thread *td);
+int  ncp_conn_assert_locked(struct ncp_conn *conn,char *checker,struct thread *td);
 void ncp_conn_invalidate(struct ncp_conn *ncp);
 int  ncp_conn_invalid(struct ncp_conn *ncp);
 /*int  ncp_conn_ref(struct ncp_conn *conn, pid_t pid);
 int  ncp_conn_rm_ref(struct ncp_conn *conn, pid_t pid, int force);
 void ncp_conn_list_rm_ref(pid_t pid);*/
-int  ncp_conn_getbyref(int connRef,struct proc *p,struct ucred *cred, int mode,
+int  ncp_conn_getbyref(int connRef,struct thread *td, struct ucred *cred, int mode,
 	struct ncp_conn **connpp);
-int  ncp_conn_getbyli(struct ncp_conn_loginfo *li,struct proc *p,struct ucred *cred, 
+int  ncp_conn_getbyli(struct ncp_conn_loginfo *li,struct thread *td, struct ucred *cred, 
 	int mode, struct ncp_conn **connpp);
 int  ncp_conn_setprimary(struct ncp_conn *conn, int on);
-int  ncp_conn_locklist(int flags, struct proc *p);
-void ncp_conn_unlocklist(struct proc *p);
-int  ncp_conn_gethandle(struct ncp_conn *conn, struct proc *p, struct ncp_handle **handle);
-int  ncp_conn_puthandle(struct ncp_handle *handle, struct proc *p, int force);
-int  ncp_conn_findhandle(int connHandle, struct proc *p, struct ncp_handle **handle);
-int  ncp_conn_getattached(struct ncp_conn_args *li,struct proc *p,struct ucred *cred,int mode, struct ncp_conn **connpp);
-int  ncp_conn_putprochandles(struct proc *p);
+int  ncp_conn_locklist(int flags, struct thread *td);
+void ncp_conn_unlocklist(struct thread *td);
+int  ncp_conn_gethandle(struct ncp_conn *conn, struct thread *td, struct ncp_handle **handle);
+int  ncp_conn_puthandle(struct ncp_handle *handle, struct thread *td, int force);
+int  ncp_conn_findhandle(int connHandle, struct thread *td, struct ncp_handle **handle);
+int  ncp_conn_getattached(struct ncp_conn_args *li,struct thread *td, struct ucred *cred,int mode, struct ncp_conn **connpp);
+int  ncp_conn_putprochandles(struct thread *td);
 int  ncp_conn_getinfo(struct ncp_conn *ncp, struct ncp_conn_stat *ncs);
 
 int  ncp_conn_reconnect(struct ncp_conn *ncp);
-int  ncp_conn_login(struct ncp_conn *conn, struct proc *p, struct ucred *cred);
+int  ncp_conn_login(struct ncp_conn *conn, struct thread *td, struct ucred *cred);
 
 extern struct ncp_conn_head conn_list;
 extern int ncp_burst_enabled;
diff --git a/sys/netncp/ncp_rq.h b/sys/netncp/ncp_rq.h
index bff912d..106537f 100644
--- a/sys/netncp/ncp_rq.h
+++ b/sys/netncp/ncp_rq.h
@@ -99,21 +99,21 @@ struct ncp_rq {
 	int		nr_rpsize;	/* reply size minus ncp header */
 	int		nr_cc;		/* completion code */
 	int		nr_cs;		/* connection state */
-	struct proc *	nr_p;		/* proc that did rq */
+	struct thread *	nr_td;		/* thread that did rq */
 	struct ucred *	nr_cred;	/* user that did rq */
 	int		rexmit;
 	struct ncp_conn*nr_conn;	/* back link */
 };
 
-int  ncp_rq_alloc(u_int8_t fn, struct ncp_conn *ncp, struct proc *p,
+int  ncp_rq_alloc(u_int8_t fn, struct ncp_conn *ncp, struct thread *td,
 	struct ucred *cred, struct ncp_rq **rqpp);
 int  ncp_rq_alloc_any(u_int32_t ptype, u_int8_t fn, struct ncp_conn *ncp,
-	struct proc *p,	struct ucred *cred, struct ncp_rq **rqpp);
+	struct thread *td,	struct ucred *cred, struct ncp_rq **rqpp);
 int  ncp_rq_alloc_subfn(u_int8_t fn, u_int8_t subfn, struct ncp_conn *ncp,
-	struct proc *p,	struct ucred *cred, struct ncp_rq **rqpp);
+	struct thread *td,	struct ucred *cred, struct ncp_rq **rqpp);
 int  ncp_rq_init_any(struct ncp_rq *rqp, u_int32_t ptype, u_int8_t fn,
 	struct ncp_conn *ncp, 
-	struct proc *p, struct ucred *cred);
+	struct thread *td, struct ucred *cred);
 void ncp_rq_done(struct ncp_rq *rqp);
 int  ncp_request(struct ncp_rq *rqp);
 int  ncp_request_int(struct ncp_rq *rqp);