Module Name: src
Committed By: ozaki-r
Date: Fri Nov 10 07:25:39 UTC 2017
Modified Files:
src/sys/netinet6: nd6.c
Log Message:
Use psref instead of pserialize because that code is sleepable
To generate a diff of this commit:
cvs rdiff -u -r1.237 -r1.238 src/sys/netinet6/nd6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.237 src/sys/netinet6/nd6.c:1.238
--- src/sys/netinet6/nd6.c:1.237 Fri Nov 10 07:24:28 2017
+++ src/sys/netinet6/nd6.c Fri Nov 10 07:25:39 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.237 2017/11/10 07:24:28 ozaki-r Exp $ */
+/* $NetBSD: nd6.c,v 1.238 2017/11/10 07:25:39 ozaki-r Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.237 2017/11/10 07:24:28 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nd6.c,v 1.238 2017/11/10 07:25:39 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -1446,7 +1446,7 @@ nd6_rtrequest(int req, struct rtentry *r
switch (req) {
case RTM_ADD: {
- int s;
+ struct psref psref;
RT_DPRINTF("rt_getkey(rt) = %p\n", rt_getkey(rt));
/*
@@ -1554,9 +1554,8 @@ nd6_rtrequest(int req, struct rtentry *r
* check if rt_getkey(rt) is an address assigned
* to the interface.
*/
- s = pserialize_read_enter();
- ifa = (struct ifaddr *)in6ifa_ifpwithaddr(ifp,
- &satocsin6(rt_getkey(rt))->sin6_addr);
+ ifa = (struct ifaddr *)in6ifa_ifpwithaddr_psref(ifp,
+ &satocsin6(rt_getkey(rt))->sin6_addr, &psref);
if (ifa != NULL) {
if (nd6_useloopback) {
rt->rt_ifp = lo0ifp; /* XXX */
@@ -1593,7 +1592,7 @@ nd6_rtrequest(int req, struct rtentry *r
}
}
out:
- pserialize_read_exit(s);
+ ifa_release(ifa, &psref);
/*
* If we have too many cache entries, initiate immediate
* purging for some entries.
