Module Name: src
Committed By: ozaki-r
Date: Mon Jan 15 08:17:35 UTC 2018
Modified Files:
src/sys/netinet: in.c
src/sys/netinet6: in6.c
Log Message:
Remove extra pserialize_perform from in_purgeaddr
It's already performed in ifa_remove. Note so there (in in6_unlink_ifa too).
To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 src/sys/netinet/in.c
cvs rdiff -u -r1.257 -r1.258 src/sys/netinet6/in6.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/netinet/in.c
diff -u src/sys/netinet/in.c:1.214 src/sys/netinet/in.c:1.215
--- src/sys/netinet/in.c:1.214 Wed Jan 10 10:56:30 2018
+++ src/sys/netinet/in.c Mon Jan 15 08:17:34 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in.c,v 1.214 2018/01/10 10:56:30 knakahara Exp $ */
+/* $NetBSD: in.c,v 1.215 2018/01/15 08:17:34 ozaki-r Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.214 2018/01/10 10:56:30 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in.c,v 1.215 2018/01/15 08:17:34 ozaki-r Exp $");
#include "arp.h"
@@ -855,9 +855,7 @@ in_purgeaddr(struct ifaddr *ifa)
TAILQ_REMOVE(&in_ifaddrhead, ia, ia_list);
IN_ADDRLIST_WRITER_REMOVE(ia);
ifa_remove(ifp, &ia->ia_ifa);
-#ifdef NET_MPSAFE
- pserialize_perform(in_ifaddrhash_psz);
-#endif
+ /* Assume ifa_remove called pserialize_perform and psref_destroy */
mutex_exit(&in_ifaddr_lock);
IN_ADDRHASH_ENTRY_DESTROY(ia);
IN_ADDRLIST_ENTRY_DESTROY(ia);
Index: src/sys/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.257 src/sys/netinet6/in6.c:1.258
--- src/sys/netinet6/in6.c:1.257 Wed Jan 10 10:56:30 2018
+++ src/sys/netinet6/in6.c Mon Jan 15 08:17:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.257 2018/01/10 10:56:30 knakahara Exp $ */
+/* $NetBSD: in6.c,v 1.258 2018/01/15 08:17:35 ozaki-r Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.257 2018/01/10 10:56:30 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.258 2018/01/15 08:17:35 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1423,6 +1423,7 @@ in6_unlink_ifa(struct in6_ifaddr *ia, st
mutex_enter(&in6_ifaddr_lock);
IN6_ADDRLIST_WRITER_REMOVE(ia);
ifa_remove(ifp, &ia->ia_ifa);
+ /* Assume ifa_remove called pserialize_perform and psref_destroy */
mutex_exit(&in6_ifaddr_lock);
/*
