diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2002-06-11 05:14:55 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2002-06-11 05:14:55 +0000 |
| commit | be6f9dc2900c4b7bf84fd09e5ef3db75ad1ea36d (patch) | |
| tree | 17d953e01304d187fd1ab0d58267a2519cd0c123 /sys | |
| parent | ce418c43bc5319139ce8b279257d7d5320db633f (diff) | |
splassert where comments tell us to.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/in_pcb.c | 6 | ||||
| -rw-r--r-- | sys/nfs/nfs_serv.c | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index fff4e68b21f..863f8846c04 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: in_pcb.c,v 1.62 2002/06/09 16:26:10 itojun Exp $ */ +/* $OpenBSD: in_pcb.c,v 1.63 2002/06/11 05:13:59 art Exp $ */ /* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */ /* @@ -563,10 +563,12 @@ in_pcbnotify(table, dst, fport_arg, laddr, lport_arg, errno, notify) int errno; void (*notify)(struct inpcb *, int); { - register struct inpcb *inp, *oinp; + struct inpcb *inp, *oinp; struct in_addr faddr; u_int16_t fport = fport_arg, lport = lport_arg; + splassert(IPL_SOFTNET); + #ifdef INET6 /* * See in6_pcbnotify() for IPv6 codepath. By the time this diff --git a/sys/nfs/nfs_serv.c b/sys/nfs/nfs_serv.c index 2d732c30799..e98f52b1036 100644 --- a/sys/nfs/nfs_serv.c +++ b/sys/nfs/nfs_serv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: nfs_serv.c,v 1.32 2002/05/10 22:07:08 csapuntz Exp $ */ +/* $OpenBSD: nfs_serv.c,v 1.33 2002/06/11 05:14:54 art Exp $ */ /* $NetBSD: nfs_serv.c,v 1.34 1997/05/12 23:37:12 fvdl Exp $ */ /* @@ -1175,13 +1175,13 @@ loop1: * NB: Must be called at splsoftclock(). */ void -nfsrvw_coalesce(owp, nfsd) - struct nfsrv_descript *owp; - struct nfsrv_descript *nfsd; +nfsrvw_coalesce(struct nfsrv_descript *owp, struct nfsrv_descript *nfsd) { int overlap; struct mbuf *mp; + splassert(IPL_SOFTCLOCK); + LIST_REMOVE(nfsd, nd_hash); LIST_REMOVE(nfsd, nd_tq); if (owp->nd_eoff < nfsd->nd_eoff) { |