Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Remove extra pserialize_perform from in_purgeaddr



details:   https://anonhg.NetBSD.org/src/rev/003844e6bd57
branches:  trunk
changeset: 829034:003844e6bd57
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Mon Jan 15 08:17:34 2018 +0000

description:
Remove extra pserialize_perform from in_purgeaddr

It's already performed in ifa_remove. Note so there (in in6_unlink_ifa too).

diffstat:

 sys/netinet/in.c   |  8 +++-----
 sys/netinet6/in6.c |  5 +++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diffs (55 lines):

diff -r a3931adff29b -r 003844e6bd57 sys/netinet/in.c
--- a/sys/netinet/in.c  Mon Jan 15 08:17:20 2018 +0000
+++ b/sys/netinet/in.c  Mon Jan 15 08:17:34 2018 +0000
@@ -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 @@
        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);
diff -r a3931adff29b -r 003844e6bd57 sys/netinet6/in6.c
--- a/sys/netinet6/in6.c        Mon Jan 15 08:17:20 2018 +0000
+++ b/sys/netinet6/in6.c        Mon Jan 15 08:17:34 2018 +0000
@@ -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 @@
        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);
 
        /*



Home | Main Index | Thread Index | Old Index