From fbff48869eb3ce96066749804e6a3ed882688e5b Mon Sep 17 00:00:00 2001
From: Jeffrey Hsu <hsu@dragonflybsd.org>
Date: Fri, 5 Mar 2004 19:17:25 +0000
Subject: [PATCH] Propagate curproc removal changes to files compiled by LINT.

---
 sys/netproto/atalk/ddp_usrreq.c |  6 +++---
 sys/netproto/atm/atm_aal5.c     | 15 +++++++++------
 sys/netproto/atm/atm_socket.c   |  7 ++++---
 sys/netproto/atm/atm_var.h      |  5 +++--
 sys/netproto/atm/kern_include.h |  3 ++-
 sys/netproto/ipx/ipx_pcb.c      |  4 ++--
 sys/netproto/ipx/ipx_pcb.h      |  5 ++---
 sys/netproto/ipx/spx_usrreq.c   |  8 ++++----
 sys/netproto/ns/idp_usrreq.c    |  7 ++++++-
 sys/netproto/ns/spp_usrreq.c    |  4 +++-
 10 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/sys/netproto/atalk/ddp_usrreq.c b/sys/netproto/atalk/ddp_usrreq.c
index dec4afe5c0..901f0c903d 100644
--- a/sys/netproto/atalk/ddp_usrreq.c
+++ b/sys/netproto/atalk/ddp_usrreq.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1990,1994 Regents of The University of Michigan.
  * All Rights Reserved.  See COPYRIGHT.
  *
- * $DragonFly: src/sys/netproto/atalk/ddp_usrreq.c,v 1.6 2003/11/08 07:57:51 dillon Exp $
+ * $DragonFly: src/sys/netproto/atalk/ddp_usrreq.c,v 1.7 2004/03/05 19:17:25 hsu Exp $
  */
 
 #include <sys/param.h>
@@ -37,7 +37,7 @@ static u_long	ddp_sendspace = DDP_MAXSZ; /* Max ddp size + 1 (ddp_type) */
 static u_long	ddp_recvspace = 10 * ( 587 + sizeof( struct sockaddr_at ));
 
 static int
-ddp_attach(struct socket *so, int proto, struct thread *td)
+ddp_attach(struct socket *so, int proto, struct pru_attach_info *ai)
 {
 	struct ddpcb	*ddp;
 	int		error = 0;
@@ -55,7 +55,7 @@ ddp_attach(struct socket *so, int proto, struct thread *td)
 	if (error) {
 	    return (error);
 	}
-	return (soreserve( so, ddp_sendspace, ddp_recvspace ));
+	return (soreserve( so, ddp_sendspace, ddp_recvspace, ai->sb_rlimit ));
 }
 
 static int
diff --git a/sys/netproto/atm/atm_aal5.c b/sys/netproto/atm/atm_aal5.c
index f4f2934f30..8a722e6110 100644
--- a/sys/netproto/atm/atm_aal5.c
+++ b/sys/netproto/atm/atm_aal5.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sys/netatm/atm_aal5.c,v 1.6 1999/10/09 23:24:59 green Exp $
- *	@(#) $DragonFly: src/sys/netproto/atm/atm_aal5.c,v 1.6 2004/02/06 09:17:40 rob Exp $
+ *	@(#) $DragonFly: src/sys/netproto/atm/atm_aal5.c,v 1.7 2004/03/05 19:17:25 hsu Exp $
  */
 
 /*
@@ -48,7 +48,8 @@ u_long		atm_aal5_recvspace = 64 * 1024;	/* XXX */
 /*
  * Local functions
  */
-static int	atm_aal5_attach (struct socket *, int, struct thread *);
+static int	atm_aal5_attach (struct socket *, int,
+			struct pru_attach_info *);
 static int	atm_aal5_detach (struct socket *);
 static int	atm_aal5_bind (struct socket *, struct sockaddr *, 
 			struct thread *);
@@ -224,10 +225,10 @@ static Atm_attributes	atm_aal5_defattr = {
  *
  */
 static int
-atm_aal5_attach(so, proto, td)
+atm_aal5_attach(so, proto, ai)
 	struct socket	*so;
 	int		proto;
-	struct thread	*td;
+	struct pru_attach_info *ai;
 {
 	Atm_pcb		*atp;
 
@@ -236,7 +237,8 @@ atm_aal5_attach(so, proto, td)
 	/*
 	 * Do general attach stuff
 	 */
-	err = atm_sock_attach(so, atm_aal5_sendspace, atm_aal5_recvspace);
+	err = atm_sock_attach(so, atm_aal5_sendspace, atm_aal5_recvspace,
+			      ai->sb_rlimit);
 	if (err)
 		ATM_RETERR(err);
 
@@ -360,7 +362,8 @@ atm_aal5_connect(struct socket *so, struct sockaddr *addr, thread_t td)
 
 		size = atp->atp_attr.aal.v.aal5.forward_max_SDU_size;
 		if (size != T_ATM_ABSENT)
-			if (!sbreserve(&so->so_snd, size, so, td->td_proc)) {
+			if (!sbreserve(&so->so_snd, size, so,
+				       &td->td_proc->p_rlimit[RLIMIT_SBSIZE])) {
 				err = ENOBUFS;
 				ATM_OUTRO();
 			}
diff --git a/sys/netproto/atm/atm_socket.c b/sys/netproto/atm/atm_socket.c
index 9a818d3428..5d77105d59 100644
--- a/sys/netproto/atm/atm_socket.c
+++ b/sys/netproto/atm/atm_socket.c
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sys/netatm/atm_socket.c,v 1.4 1999/08/28 00:48:37 peter Exp $
- *	@(#) $DragonFly: src/sys/netproto/atm/atm_socket.c,v 1.5 2004/02/26 14:25:29 joerg Exp $
+ *	@(#) $DragonFly: src/sys/netproto/atm/atm_socket.c,v 1.6 2004/03/05 19:17:25 hsu Exp $
  */
 
 /*
@@ -76,10 +76,11 @@ static struct t_atm_cause	atm_sock_cause = {
  *
  */
 int
-atm_sock_attach(so, send, recv)
+atm_sock_attach(so, send, recv, rl)
 	struct socket	*so;
 	u_long		send;
 	u_long		recv;
+	struct rlimit	*rl;
 {
 	Atm_pcb		*atp = sotoatmpcb(so);
 	int		err;
@@ -100,7 +101,7 @@ atm_sock_attach(so, send, recv)
 	 * Reserve socket buffer space, if not already done
 	 */
 	if ((so->so_snd.sb_hiwat == 0) || (so->so_rcv.sb_hiwat == 0)) {
-		err = soreserve(so, send, recv);
+		err = soreserve(so, send, recv, rl);
 		if (err)
 			return (err);
 	}
diff --git a/sys/netproto/atm/atm_var.h b/sys/netproto/atm/atm_var.h
index 2df1287a41..92ddf172d4 100644
--- a/sys/netproto/atm/atm_var.h
+++ b/sys/netproto/atm/atm_var.h
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sys/netatm/atm_var.h,v 1.2 1999/08/28 00:48:39 peter Exp $
- *	@(#) $DragonFly: src/sys/netproto/atm/atm_var.h,v 1.7 2004/02/06 09:17:40 rob Exp $
+ *	@(#) $DragonFly: src/sys/netproto/atm/atm_var.h,v 1.8 2004/03/05 19:17:25 hsu Exp $
  *
  */
 
@@ -168,7 +168,8 @@ int		atm_create_stack (Atm_connvc *, struct stack_list *,
 			void (*)(int, void *, int, int) );
 
 	/* atm_socket.c */
-int		atm_sock_attach (struct socket *, u_long, u_long);
+int		atm_sock_attach (struct socket *, u_long, u_long,
+			struct rlimit *);
 int		atm_sock_detach (struct socket *);
 int		atm_sock_bind (struct socket *, struct sockaddr *);
 int		atm_sock_listen (struct socket *, Atm_endpoint *);
diff --git a/sys/netproto/atm/kern_include.h b/sys/netproto/atm/kern_include.h
index cf3c08198b..75134d7c78 100644
--- a/sys/netproto/atm/kern_include.h
+++ b/sys/netproto/atm/kern_include.h
@@ -24,7 +24,7 @@
  * notice must be reproduced on all copies.
  *
  *	@(#) $FreeBSD: src/sys/netatm/kern_include.h,v 1.3 1999/08/28 00:48:40 peter Exp $
- *	@(#) $DragonFly: src/sys/netproto/atm/kern_include.h,v 1.4 2004/02/06 09:17:40 rob Exp $
+ *	@(#) $DragonFly: src/sys/netproto/atm/kern_include.h,v 1.5 2004/03/05 19:17:25 hsu Exp $
  *
  */
 
@@ -56,6 +56,7 @@
 #include <sys/conf.h>
 #include <sys/domain.h>
 #include <sys/protosw.h>
+#include <sys/resourcevar.h>
 #include <sys/socket.h>
 #include <sys/socketvar.h>
 #include <sys/syslog.h>
diff --git a/sys/netproto/ipx/ipx_pcb.c b/sys/netproto/ipx/ipx_pcb.c
index a90dd709f8..a1022ff26f 100644
--- a/sys/netproto/ipx/ipx_pcb.c
+++ b/sys/netproto/ipx/ipx_pcb.c
@@ -34,7 +34,7 @@
  *	@(#)ipx_pcb.c
  *
  * $FreeBSD: src/sys/netipx/ipx_pcb.c,v 1.18.2.1 2001/02/22 09:44:18 bp Exp $
- * $DragonFly: src/sys/netproto/ipx/ipx_pcb.c,v 1.6 2003/08/07 21:17:37 dillon Exp $
+ * $DragonFly: src/sys/netproto/ipx/ipx_pcb.c,v 1.7 2004/03/05 19:17:25 hsu Exp $
  */
 
 #include <sys/param.h>
@@ -55,7 +55,7 @@
 static struct	ipx_addr zeroipx_addr;
 
 int
-ipx_pcballoc(struct socket *so, struct ipxpcb *head, struct thread *td)
+ipx_pcballoc(struct socket *so, struct ipxpcb *head)
 {
 	struct ipxpcb *ipxp;
 
diff --git a/sys/netproto/ipx/ipx_pcb.h b/sys/netproto/ipx/ipx_pcb.h
index 078a8e78f2..df18d2b81b 100644
--- a/sys/netproto/ipx/ipx_pcb.h
+++ b/sys/netproto/ipx/ipx_pcb.h
@@ -34,7 +34,7 @@
  *	@(#)ipx_pcb.h
  *
  * $FreeBSD: src/sys/netipx/ipx_pcb.h,v 1.15 1999/12/29 04:46:08 peter Exp $
- * $DragonFly: src/sys/netproto/ipx/ipx_pcb.h,v 1.4 2003/08/23 10:06:23 rob Exp $
+ * $DragonFly: src/sys/netproto/ipx/ipx_pcb.h,v 1.5 2004/03/05 19:17:25 hsu Exp $
  */
 
 #ifndef _NETIPX_IPX_PCB_H_
@@ -83,8 +83,7 @@ struct ipxpcb {
 #ifdef _KERNEL
 extern struct ipxpcb ipxpcb;			/* head of list */
 
-int	ipx_pcballoc (struct socket *so, struct ipxpcb *head,
-			  struct thread *td);
+int	ipx_pcballoc (struct socket *so, struct ipxpcb *head);
 int	ipx_pcbbind (struct ipxpcb *ipxp, struct sockaddr *nam,
 			 struct thread *td);
 int	ipx_pcbconnect (struct ipxpcb *ipxp, struct sockaddr *nam,
diff --git a/sys/netproto/ipx/spx_usrreq.c b/sys/netproto/ipx/spx_usrreq.c
index ae66c40ccf..1d124031f6 100644
--- a/sys/netproto/ipx/spx_usrreq.c
+++ b/sys/netproto/ipx/spx_usrreq.c
@@ -34,7 +34,7 @@
  *	@(#)spx_usrreq.h
  *
  * $FreeBSD: src/sys/netipx/spx_usrreq.c,v 1.27.2.1 2001/02/22 09:44:18 bp Exp $
- * $DragonFly: src/sys/netproto/ipx/spx_usrreq.c,v 1.6 2004/03/05 16:57:16 hsu Exp $
+ * $DragonFly: src/sys/netproto/ipx/spx_usrreq.c,v 1.7 2004/03/05 19:17:25 hsu Exp $
  */
 
 #include <sys/param.h>
@@ -1612,15 +1612,15 @@ spx_shutdown(so)
 }
 
 static int
-spx_sp_attach(so, proto, td)
+spx_sp_attach(so, proto, ai)
 	struct socket *so;
 	int proto;
-	struct thread *td;
+	struct pru_attach_info *ai;
 {
 	int error;
 	struct ipxpcb *ipxp;
 
-	error = spx_attach(so, proto, td);
+	error = spx_attach(so, proto, ai);
 	if (error == 0) {
 		ipxp = sotoipxpcb(so);
 		((struct spxpcb *)ipxp->ipxp_pcb)->s_flags |=
diff --git a/sys/netproto/ns/idp_usrreq.c b/sys/netproto/ns/idp_usrreq.c
index 42b43cf290..899f84d104 100644
--- a/sys/netproto/ns/idp_usrreq.c
+++ b/sys/netproto/ns/idp_usrreq.c
@@ -32,7 +32,7 @@
  *
  *	@(#)idp_usrreq.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/netns/idp_usrreq.c,v 1.9 1999/08/28 00:49:47 peter Exp $
- * $DragonFly: src/sys/netproto/ns/idp_usrreq.c,v 1.6 2004/02/16 20:37:20 dillon Exp $
+ * $DragonFly: src/sys/netproto/ns/idp_usrreq.c,v 1.7 2004/03/05 19:17:25 hsu Exp $
  */
 
 #include <sys/param.h>
@@ -390,6 +390,7 @@ idp_usrreq(so, req, m, nam, control)
 	int req;
 	struct mbuf *m, *nam, *control;
 {
+#ifdef OBSOLETE		/* not converted to new FreeBSD usrreq style XXX */
 	struct nspcb *nsp = sotonspcb(so);
 	int error = 0;
 
@@ -545,6 +546,8 @@ release:
 	if (m != NULL)
 		m_freem(m);
 	return (error);
+#endif
+	return (0);
 }
 /*ARGSUSED*/
 int
@@ -554,6 +557,7 @@ idp_raw_usrreq(so, req, m, nam, control)
 	struct mbuf *m, *nam, *control;
 {
 	int error = 0;
+#ifdef OBSOLETE		/* not converted to new FreeBSD usrreq style XXX */
 	struct nspcb *nsp = sotonspcb(so);
 
 	switch (req) {
@@ -580,6 +584,7 @@ idp_raw_usrreq(so, req, m, nam, control)
 	default:
 		error = idp_usrreq(so, req, m, nam, control);
 	}
+#endif
 	return (error);
 }
 
diff --git a/sys/netproto/ns/spp_usrreq.c b/sys/netproto/ns/spp_usrreq.c
index 759c3bdb75..c8445d6eb4 100644
--- a/sys/netproto/ns/spp_usrreq.c
+++ b/sys/netproto/ns/spp_usrreq.c
@@ -32,7 +32,7 @@
  *
  *	@(#)spp_usrreq.c	8.1 (Berkeley) 6/10/93
  * $FreeBSD: src/sys/netns/spp_usrreq.c,v 1.11 1999/08/28 00:49:53 peter Exp $
- * $DragonFly: src/sys/netproto/ns/spp_usrreq.c,v 1.6 2004/02/16 20:37:20 dillon Exp $
+ * $DragonFly: src/sys/netproto/ns/spp_usrreq.c,v 1.7 2004/03/05 19:17:25 hsu Exp $
  */
 
 #include <sys/param.h>
@@ -1280,6 +1280,7 @@ spp_usrreq(so, req, m, nam, controlp)
 	struct mbuf *mm;
 	struct sockbuf *sb;
 
+#ifdef OBSOLETE		/* not converted to FreeBSD usrreq style XXX */
 	if (req == PRU_CONTROL)
                 return (ns_control(so, (int)m, (caddr_t)nam,
 			(struct ifnet *)controlp));
@@ -1518,6 +1519,7 @@ release:
 	if (m != NULL)
 		m_freem(m);
 	splx(s);
+#endif
 	return (error);
 }
 
-- 
2.41.0